BF: addressing cmts of @eickenberg