Update for PR comments