Gun integration update