Changes to new formatting