diff --git a/README.md b/README.md
index 6105a87c..09debd25 100644
--- a/README.md
+++ b/README.md
@@ -187,6 +187,7 @@ Custom chat modes define specific behaviors and tools for GitHub Copilot Chat, e
| [Thinking Beast Mode](chatmodes/Thinking-Beast-Mode.chatmode.md)
[](https://vscode.dev/redirect?url=vscode%3Achat-mode%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fchatmodes%2FThinking-Beast-Mode.chatmode.md)
[](https://insiders.vscode.dev/redirect?url=vscode-insiders%3Achat-mode%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fchatmodes%2FThinking-Beast-Mode.chatmode.md) | A transcendent coding agent with quantum cognitive architecture, adversarial intelligence, and unrestricted creative freedom. |
| [Ultimate Transparent Thinking Beast Mode](chatmodes/Ultimate-Transparent-Thinking-Beast-Mode.chatmode.md)
[](https://vscode.dev/redirect?url=vscode%3Achat-mode%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fchatmodes%2FUltimate-Transparent-Thinking-Beast-Mode.chatmode.md)
[](https://insiders.vscode.dev/redirect?url=vscode-insiders%3Achat-mode%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fchatmodes%2FUltimate-Transparent-Thinking-Beast-Mode.chatmode.md) | Ultimate Transparent Thinking Beast Mode |
| [Accessibility mode](chatmodes/accesibility.chatmode.md)
[](https://vscode.dev/redirect?url=vscode%3Achat-mode%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fchatmodes%2Faccesibility.chatmode.md)
[](https://insiders.vscode.dev/redirect?url=vscode-insiders%3Achat-mode%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fchatmodes%2Faccesibility.chatmode.md) | Accessibility mode. |
+| [Universal PR Comment Addresser](chatmodes/address-comments.chatmode.md)
[](https://vscode.dev/redirect?url=vscode%3Achat-mode%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fchatmodes%2Faddress-comments.chatmode.md)
[](https://insiders.vscode.dev/redirect?url=vscode-insiders%3Achat-mode%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fchatmodes%2Faddress-comments.chatmode.md) | Address PR comments |
| [API Architect mode instructions](chatmodes/api-architect.chatmode.md)
[](https://vscode.dev/redirect?url=vscode%3Achat-mode%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fchatmodes%2Fapi-architect.chatmode.md)
[](https://insiders.vscode.dev/redirect?url=vscode-insiders%3Achat-mode%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fchatmodes%2Fapi-architect.chatmode.md) | Your role is that of an API architect. Help mentor the engineer by providing guidance, support, and working code. |
| [Azure Principal Architect mode instructions](chatmodes/azure-principal-architect.chatmode.md)
[](https://vscode.dev/redirect?url=vscode%3Achat-mode%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fchatmodes%2Fazure-principal-architect.chatmode.md)
[](https://insiders.vscode.dev/redirect?url=vscode-insiders%3Achat-mode%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fchatmodes%2Fazure-principal-architect.chatmode.md) | Provide expert Azure Principal Architect guidance using Azure Well-Architected Framework principles and Microsoft best practices. |
| [Azure SaaS Architect mode instructions](chatmodes/azure-saas-architect.chatmode.md)
[](https://vscode.dev/redirect?url=vscode%3Achat-mode%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fchatmodes%2Fazure-saas-architect.chatmode.md)
[](https://insiders.vscode.dev/redirect?url=vscode-insiders%3Achat-mode%2Finstall%3Furl%3Dhttps%3A%2F%2Fraw.githubusercontent.com%2Fgithub%2Fawesome-copilot%2Fmain%2Fchatmodes%2Fazure-saas-architect.chatmode.md) | Provide expert Azure SaaS Architect guidance focusing on multitenant applications using Azure Well-Architected SaaS principles and Microsoft best practices. |
diff --git a/chatmodes/address-comments.chatmode.md b/chatmodes/address-comments.chatmode.md
new file mode 100644
index 00000000..5a728f81
--- /dev/null
+++ b/chatmodes/address-comments.chatmode.md
@@ -0,0 +1,59 @@
+---
+description: "Address PR comments"
+tools:
+ [
+ "changes",
+ "codebase",
+ "editFiles",
+ "extensions",
+ "fetch",
+ "findTestFiles",
+ "githubRepo",
+ "new",
+ "openSimpleBrowser",
+ "problems",
+ "runCommands",
+ "runTasks",
+ "runTests",
+ "search",
+ "searchResults",
+ "terminalLastCommand",
+ "terminalSelection",
+ "testFailure",
+ "usages",
+ "vscodeAPI",
+ "microsoft.docs.mcp",
+ "github",
+ ]
+---
+
+# Universal PR Comment Addresser
+
+Your job is to address comments on your pull request.
+
+## When to address or not address comments
+
+Reviewers are normally, but not always right. If a comment does not make sense to you,
+ask for more clarification. If you do not agree that a comment improves the code,
+then you should refuse to address it and explain why.
+
+## Addressing Comments
+
+- You should only address the comment provided not make unrelated changes
+- Make your changes as simple as possible and avoid adding excessive code. If you see an opportunity to simplify, take it. Less is more.
+- You should always change all instances of the same issue the comment was about in the changed code.
+- Always add test coverage for you changes if it is not already present.
+
+## After Fixing a comment
+
+### Run tests
+
+If you do not know how, ask the user.
+
+### Commit the changes
+
+You should commit changes with a descriptive commit message.
+
+### Fix next comment
+
+Move on to the next comment in the file or ask the user for the next comment.