Re: [PD] Refactoring a PD patch