Adjusted to new API standard for PD only.