Updates to new ordering