merging with franky
fixed a route