Suggestion from useraerztrtzh submitted for review - May 9, 2025

Suggestion from Munphfee submitted for review - May 6, 2025