Updated fit calculation