New certification and formatting changes