Yes, but no, I'm not going to rewrite all library. Anything I touch is er ... not exactly as I'd like it, but I need to do other things as well ;)