Incorporating PR comments#3