Slightly improved performance. Fixed autocorrelation