Conversion to 2.6