removed new stuff. comments are done so far