2.6 and updates