ESGTF Upgrade

Join the conversation. Be nice!