some modify for comment