Added counting ability