a bit modify for author comment