undid some bad changes

undid some bad changes