Improved staff masking