Chanage to globals

Change-Id: Ic3caf057cb9995099df2b3b52358c9330ec78f7f