Better tfold optimization