moved beforeSave out of SA and into here