Rework Q matrix in M&W so consistent with C&S 1985