Revert "updates"

This reverts commit ea8cd11cd07022536fa7d71cc8c40aedca180f10.
Revert "simplify"

This reverts commit 82bd3b48914d4be7b6bab38ba5fcdbc04c6e9682.