Improved collision detection and firing