updated project 2 and homework 4