SpreadFire_Refactor_FINISH