fixing a bit, wiring up