Updates to tmfa