[CTPP] Almost done with SF3