removed all but a few modifications