Update with new fit functions