better but you should test it first

(protip: I broke a var and you should fix it)