Let's try to minimize the unneeded changes, please.