Updated to 6.2.2 and imported some additions from Daniels 6.2.2