added statement to upload page, might need to be moved
 merge conflict