1.8 upgrade