This issue is just to track the PR I made. Goal is to implement this: <img width="908" height="423" alt="Image" src="https://github.com/user-attachments/assets/9e9291c2-591c-4a1c-a3cb-734694b43ad8" />
