First cut at PDO changes