some changes for router