Much better stat tracking