Tested new formatting