v2. redesign plug and routing