changes to server and router.