1.8 changes