fixed HW2