TF changes, UIA preparation to changes.