Large changes for final upload.