fixed all routing