Updated Scenario Builder

This break point should not be commited