Updating with HW2 spec