tst: performance improvement