HW 1.5 and HW2 added