Final Changes for upload