Some changes before running the final simulation