Suggestion from Saskardin submitted for review - September 13, 2022

Suggestion from PalinooSVK submitted for review - August 3, 2022