Update according to AD Evaluation comments

Apply AD's comments to the -06 version.