added angle, masking