Yes, almost identical - I have almost all the unthemed grid, 3 or 4 likely superfluous (cryptic) words, most of the superfluous letters and a couple of links but no threesomes. The forest cryptic word could go either way for me - to link with 2d or with what I assume 22a must be ....