Improve simulation