A set of changes related to TFA