Updated TFL functionality