Merge pull request #1 from yaoxiangg/250814

Refactored2