Simulation v2.11

Merged version