Patched up _save and callback to work nicely