Revert "More updates on the adds"

This reverts commit 2489dfe719737bcbad898fc9ee37864cad9e47e4.