2.x multiple changes