Updated the simulation and model files - with optimizations