rearranged router