Addressing feedback from @ebidel