Updates to timing and  Tactician