It would also help if the church was more sensitive to non-Catholic spouses during marriage preparation. A lot of the preparation materials seem geared to both members of the couple being Catholic, which is awkward for a non-Catholic person.