added a little more functionality to firing