Redid the public format to be more flat