Updates to TMTW