Finished modifications of Simulation Module.