Updated Scenario Builder

TBD