Continued to add simulation functionallity