Reordered endpoints