Updated stats calculation