revert back to project 2 functionality