Added channel masking