Revert "Updates"

This reverts commit b760cb11382ea503a87b927a777b124121b14d95.
Revert "Updates"

This reverts commit f0421ec0c7c603270c37f873501edb9227b623a7.