Tweaking router so that it is more intuitive