Randy submitted version -10 with a number of changes.