minor wiring up