added smoothing and non-product measures