Changes for HW2