last modifications on scenario helper