Changed order of routes