Reorganized the format