PDI-9647 - Revisions based on Carter's testing