Added a better way to set up simulationg