Fix ModeT and add TimeT