Scenarios 2 and 3 implemented