Performed refactoring before adding channel 2