rewiring some components