refacto profile + stats