HW section 2 changes merged