some code changes in the scenerio