firing logic updated and some bug fixes
merge conflict