beginning of fixing the doc..