changed router.js and requestHandlers.js