Update to use master channel