Shall we settle this down? If it's okay, I'll start to clean up the code, the change is not very trivial you know.