new route, some fixes