6.2 - cleanup version, no hacks