Changed to numbered formats  (2.6 compatible)