Changed around how output is ordered