non-working version: updates on fitting