Move to more minimal changes