Smooth transaction as promised

Review