completed rebuild of counter system => more speed