Changed fire logic