Restore 6 month weighting for estimate generation

Copied a stray change while moving estimate code out of controller class