added masks, need fix