Refactor, limit to 10 messages