some changes in routing structure