Much more sorting out