Added counters to make baptiste happy