Formatting changes in marginals - untested - might be broken