+ changes in transition to new v10 of code.