Add some fields
Fix some bugs
modify result