Just as the title says.

need to introduce better code to handle duplicate saves.