[REV] Update count script to be more accurate