Change to help adapt to the distributed net