Updated usenix_main--deleted their stuff, added ours