Finalization of HW 2-1 and 2-2