Rewiring improved