Moved time trust into tracker