Estimate is calculating correctly now