Modified the path builder