Improves water counting