Added Gun logic