Revert "Revert "Updates""

This reverts commit afc6e077d77426785e1086c350f8ad49b2789f27.