Memory Upload Functional
Fixed Merge conflicts