Switched to simple variables, prefixed with GOCD to avoid collisions.