US79445: improved code-samples further