Made it work much nicer