addressing @will-moore comments