Undid my terrible code