Added ad-hoc channel controller