Switched to path based routing. Almost done...