Staging: cdata-ts.c and cdata-fb.c