Reduced number of times shotgun connection is made during to one
- needs code tidy-up & testing