working on fire script
merge conflicts