improved router performance a bit