Rework to use Channels