refactored WithToolTip once more