Redesign of router