Changed upload behaviour