Update all to use more reliable ordering system