Modified multivariate to match new layout