changes for 2.3
minor