Take 2, after CLOP

bench: 7797026