Some new changes to format