incorporate Bernhards feedback