Updated so issues on Router