modified Router