Updated count scripts