Scenario 2.5,2.6 code imrprove