Thanks Petos and Marek,

I'll commit them!

Oliver