Incorporating PR comments#2