Step 3: added Features from HW3 and finished HW4 scenarios