Fixed sorting, now ordered, incremented version