Updated U-p and U_op's calc