some routing fixed