Updated to work with TTT >= 100