Went back to standardizing conditional on Z.