changed masking functors to have better names