Update with clarifications from discussion with rsleevi