BW: mask management changed (to be verified)