adjustments to transaction handling