added project assignment, refactoring