made changes from eric, ensure all tests passing