Smoke origin revamped

I wanted to add a few things