Added stuff for 4 and 5 for HW 2