HW2 restructured