Added support for handling 6 columns in the original format.