Refactoring and changing PF 3.5.RC1