Added TAPA and TFFR