Updated P/O to handle actual Roumani's schema. Works now.