Change NOTCONNECTED_CHANNEL_KEY constant to WAITING_CHANNEL_KEY