Adapated comments