Beginnings of the 1.6.X update