how about this implementation ?

Hi,

Please have a look at this new implementation and let me know if this is ok.

Cheers,