undid major changes that didnt work :(