Data sorted, other changes