undid all the stuff so it will work