And here still.

Can you go over the diff and check this things for yourself?