Trying a couple changes to pair management.