Update to work with TTX