1.6 upgrade