Fast payment, smooth transaction again

Review