Step 6: Added Conditions