Made some changes to stats to make them more generic