Undid some old changes