modify some code
Merge remote-tracking branch 'remotes/origin/ph4' into ph4_review