incorporated networking and merged other changes