Sorry, but I'm really against changing this very central and very important function at this stage in this release. Please revert it to it's original form and create a new function if you need one.