Updated to latest Jacobi