Updated to use shotgun 7.