improved route code
improved route code