cleaned up network... more to be done