Added more stuff to counter class