Revision of the old format