Finishing changes to CPFV Owner Qs