Merci Thomas!
I have to move on, so...

The final version is here.