added Jerry & some divergence stuff, also mask volume