Add fastmc-style YR tracking for baseline