re-add tracker, tests work