Modified order of sections, added informations, etc.