a few changes to try and solve fire once and stop