Added external, moved PD