Added GONMacros