WIP TFAR minor changes