Improved router.