Added the new formatting and updates to all