Stats Refactored Fixs