Please Mr Collaborator, will you pull this excellent code into the core version