Updating fill TF methods - not finished.