New version of the patch, which I believe address your comments.


        Stefan