This is my new version and its so much more cleaner