WIP temp hack for the sorted output