refactored stats