updated cs360 project 1