Transfer from 1.5.2 to 1.6.2

Its funny how changing one file name makes all of the changes!