first changes to get the fit errors