Improves new formatting system