Modified to make firing work
 With conflicts