Updates for all!
Revert "Updates for all!"

This reverts commit 56df23678f69b00a452a9c68dbdd781bfed8e766.
Revert "Revert "Updates for all!""

This reverts commit f6b6398c5f4221e757fc44eedd064dc778a89daf.