modified default router behaviour