reverting some code that was not working