Added handling for first shots