Use proper headings and add compatibility info