Added smoke
Smoke changes