In other words, the only thing wrong with this PR is the part of the code I left unchanged?