Enhance Simulation Engine - Part 3