HW12 and fix HW11

HW12 and fix HW11