Better tracking (similar to HYROAS)

--