Fixed functions to require passing in model and derivatives, ratio, etc.