Switch to cherry picking the relevant difference