Conform to command changes