addressing issues raised by @mikemcquaid