Improve firing