save/calculate toggling was improved