[PD] Switching from Vanilla to Extended