Change ordering to use fn and col