changed to upload style
merging conflicts