Fixed The firing steps/states
Merge origin/master