reverted David's changes

broke some things, we will go through determine what broke