Refactored Count/natural flush