1.7 upgrade