updated upto project 2 and midterm