+ changes in transition to v10 of code.