updated with counters