Switched to new format style