improving main scenarios