Updated to work with shotgun