modify logic
Merge branch 'ph5' into ph5_review