Improvements to simulation
Improvements to simulation