diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZendoPublisherWidget.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZendoPublisherWidget.java
index 5f36192..862da97 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZendoPublisherWidget.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/client/CkanToZendoPublisherWidget.java
@@ -48,7 +48,7 @@ public class CkanToZendoPublisherWidget {
 	public void publishOnZenodo(final CatalogueItem item) {
 		
 		final Modal modal = new Modal(true);
-		modal.setTitle("Publishing on Zenodo...");
+		modal.setTitle("Upload to Zenodo...");
 		modal.addStyleName("ckan2zenodo-modal-style");
 		modal.setCloseVisible(true);
 		buttonPublish.setEnabled(false);
@@ -121,7 +121,7 @@ public class CkanToZendoPublisherWidget {
 				if(allFormsAreValid) {
 					buttonPublish.setEnabled(false);
 					basicTabPanel.getElement().getStyle().setOpacity(0.5);
-					final LoaderIcon loaderPublishing = new LoaderIcon("Trying to upload on Zenodo...");
+					final LoaderIcon loaderPublishing = new LoaderIcon("Trying to upload on Zenodo, please wait...");
 					modalFooter.add(loaderPublishing);
 					//Submit publish on zenodo.
 					ZenodoItem zenodoItem = manager.getZenodoItemFromFieldsForm();
diff --git a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoPublisherServiceImpl.java b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoPublisherServiceImpl.java
index 5e4c3bd..70e7ec3 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoPublisherServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckan2zenodopublisher/server/CkanToZenodoPublisherServiceImpl.java
@@ -3,6 +3,9 @@ package org.gcube.portlets.widgets.ckan2zenodopublisher.server;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import org.gcube.data.publishing.ckan2zenodo.Ckan2Zenodo;
 import org.gcube.data.publishing.ckan2zenodo.Ckan2ZenodoImpl;
@@ -84,7 +87,7 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
 			
 			//Actually publish to zenodo : 
 			// Step 1 : metadata
-			/*Ckan2Zenodo client= new Ckan2ZenodoImpl();
+			Ckan2Zenodo client= new Ckan2ZenodoImpl();
 			zenodoDepositionPreview = client.updatedMetadata(zenodoDepositionPreview);
 
 			//Step 2 : publish Resources 
@@ -101,17 +104,17 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
 			// Get the item representation
 			CkanItemDescriptor item=client.read(zenodoItem.getName());
 			//Finalize
-			client.publish(zenodoDepositionPreview, item);*/
+			client.publish(zenodoDepositionPreview, item);
 			return zenodoDepositionPreview.toString();
 			
-/*		}catch (TimeoutException e) {
+		}catch (TimeoutException e) {
 			String error = "I'm waiting too time for publishing on Zenodo the catalogue item: "+zenodoItem.getName()+". Check by yourself the result later";
 			LOG.error(error, e);
 			String clientError = String.format("%s", error);
 			throw new Exception(clientError);
-*/
+
 		} catch (Exception e) {
-			String error = "Error when publishing on Zenodo the catalogue item: "+zenodoItem.getName();
+			String error = "Error during upload to Zenodo the catalogue item: "+zenodoItem.getName();
 			LOG.error(error, e);
 			String clientError = String.format("%s. %s", error, CkanToZendoPublisherWidgetConstant.MSG_OF_ERROR_REFRESH_AND_TRY_AGAIN_OR_CONTACT_THE_SUPPORT);
 			throw new Exception(clientError);