Smooth transaction again

Review