Updated to use the proper Globals