2.6 support