Fixed HW21 and Added HW22