Updated Scenario Builder

Actually this should've been sorted in an automated way by hacking, but I'll check