preparing for t1 data buffer refactor