Eliminated KickStartDone and using ChannelRegistered