Undid some unnecessary changes to get things to compile