Updated project 2