edited to add HW2