Moved the conditions to the outside of the cluster in the case of one condition in cluster + added the creation of empty channels