reverted changes from last commit; did not fix error