refactor tracker to activity