More changes to allow networking