Channels should now be done for new layout