Now takes the numpar parameters correctly