Estimate and other model changes