address comments/suggestions from Asmus Freytag