Enhance Simulation Engine : Part 2