removed development code
Added more channels