H.2 - corrected #9, fixed step2 layout