Made Routes Shorter
fix merge conflict again