Corrected Format and structure