changes to API, removes t1 and t2 from public API