Your are right i only had a quick view when writing my post.
Now i spend more time reviewing your commit and placing your code there is definitly a good solution