still addressing @bthirion's comments