Revert "Revert "Updates""

This reverts commit 299199044e835e714de315177ece5264bdaf803c.