Improved disk counting