tweaks to save callback