prep for temp branch
Naming of channels in conditions updated