Simplify berry counting