modify handleRequest