More changes to new formatting