P4 local changes refactoring. (2)