MERGE AND REFACTORING OF CLOUDUP