Well maybe the sorting should be here instead...