Undid 2 Commits

Undid commit 65693f3 and  dfaa732