HW 32 commit