commit for HW2&3