contrib router code updated