Changes event firing to match comment in pull request

Updates based on comments in pull request