switching to save on completion to not break things