Incorporating feedback comments #377