Reworked the way scenarios are started