Changed to hierarchical version for less autocorrelation