Refactored: statistics lil changes