move todoctrl saving to watch