improvements on moderation #6