HW 2.1 commit