Moving saves into conditions to reduce load