Addresses PR comments