@tf tweaks