feature masking added as an option, not switched on by default