added 1 and 2 hw