Make better router