updated for project 2