improvements to router