Hi Serge
Have a look at the attached version.
Stéfan