todo + tx ser. improvement.