Better tracking for old sources