Changes to simulation