Change order and add option to track a branch