GON-16: more time tracker stuff