Modified the route action to a more logical