Move toward only TMP functionality