Update to include globals change