implement feedback from kelley, see pr #156