working on scenario - almost everything working well