Updated implementations and callers of fit functions