Start of my update to 1.6