updated trapping water with brief analysis