Don't save context when already saved

And modify design to be more visible / explicit.