Revert "removed all but a few modifications"

This reverts commit fe843241ce84a094a118ade4909e3745519787f6.