Redesigned the router with connect