Thank you. Just measured Jon again. And he is 21waist and 13 thigh so I got it wrong!
And just off topic, i have got a preloved FF it has a square folded in half and half again and a flat booster that has presumably bamboo velour on top. Is it possible to tell if it is FF or FN? (It lasted all night so assume FN but just wanted to check