New: self-tracking