Latest version including more sorting fixes