Add Christine's base changes.
Revert "Add Christine's base changes."

This reverts commit 403f1ee9895b076119adce0990f95aafea4de0e3.
Revert "Revert "Add Christine's base changes.""

This reverts commit edcdd94192f61d9affd2e4d30a0083a39fa6de56.