changes for final upload