add collision and shot removal