Updated counter and basic functioning with Zeev