Deployment and some routing changes