Refactor
Scenario 2