+ added mask support