Does this need `entity.visibility` as well ?