Improved gen/upload sections.