working riprouter for dylan branch