Changes related to HW4P1