make project
revert last 2 changes - incorrect refactoring