masking support; add notes