Updated fitting method