Preparation for more logical trip sorting