Scenario 2.1 implemented