Yes, this is the better version!
It took like, 15 minutes to change it, but please, love and star! (There was a bug, and it took a LONG time to fix it)
