implement @limhoff-r7 feedback
implement @limhoff-r7 feedback