1.9 upgrade