Ide 901

Greg,

I have updated the code for our review comments for pull#624