Addressing comments/feedback from redhat