Rewrite to listen to save events