Added some masking