More work on the stats calculations