Revert "Revert "Power Up adjustments""

This reverts commit 33ed38ee0b2aab15929ed992eb0d44cb615ba2b2.