#1 prepare for changes