[PD-dev] [route] improvement?