better version of my first one.