added goon tracking