Improve fire calculation