Update based on feedback from Michael Ossmann (mossmann)