Major changes to bring closer inline with OASIS styles