Here is a revamped patch.

Samuel