more smoke changes