Changes to get simulation running