Update simulation scenario.

Refactored the code a bit.