Refactored Scenarios + Code