update strategy
Merge branch 'haokun'