Global.java changes