remove atomic integer and add channel changes