Ugrade to 2.6 changes