Updated main HW2 file