editing and some addition to the masking section.