Don't blame me that my old code wasn't pretty ;-)