incomplete update to 1.6.X