Minor modification to make possible to do simple counting...