jhart-r7 suggestions added