removed GL stuff, added network stuff
merge2