That's much better. I have rewritten the patch to change that, and drop the unnecessary Enable/Disable functions.