CJ - Finishing up estimate updater