Update to fix saving model on complete toggle