Updated ordering to fn / col