modify the p3 behaviour
Merge branch 'develop'