First adjustments for new help-function.