Modified elements of this branch to correctly implement new communication
channel.