Added new upload method
Resolved conflicts