Update to 2.6