changes related to review comments #22