HW2 branch merge