Made a better version