Revert last Commit

the code wouldn't run for me when I made these changes so I am reverting them back..