Fundamental overhaul. Return to old estimation procedures.