updated request and router