Feature/more quadrature