Updated path ordering