Target detect, firing, empty conditions added