modified some router