incorporate feedback in #88