Adding back KM tracking