One huge improvement. Enabling support to scenario's modification on the