massive reconfiguration time again.

Open the hood!!!