-Fully fixed for using with TSv3