This takes into considerations Patricks feedback.

cheers,
jamal