Finishing the tp7 and almost the 8