Small changes to simulation