modified router.class