incorporated suggestions for changes in 3.1