Changed the column order in the non-averaged version.