continue work on preserve state on config change