Updated Stats Generation