diff --git a/conf/OnlineReview.xml b/conf/OnlineReview.xml
index ee81772b45..0573a4f30c 100644
--- a/conf/OnlineReview.xml
+++ b/conf/OnlineReview.xml
@@ -5311,6 +5311,9 @@
                 <Value>@aws_s3_bucket_dmz@</Value>
             </Property>
         </Property>
+        <Property name="submission_api">
+            <Value>@submission_api_endpoint@</Value>
+        </Property>
     </Config>
 
     <!--
diff --git a/lib b/lib
index 18b3f1c1bf..e81bce8012 160000
--- a/lib
+++ b/lib
@@ -1 +1 @@
-Subproject commit 18b3f1c1bf6f49595db16238766361e5b9b8f816
+Subproject commit e81bce80125b50861dcc551ef140e73ca2f67c91
diff --git a/src/java/main/com/cronos/onlinereview/actions/projectdetails/BaseProjectDetailsAction.java b/src/java/main/com/cronos/onlinereview/actions/projectdetails/BaseProjectDetailsAction.java
index c4d8b7e4fe..f6aee7852c 100644
--- a/src/java/main/com/cronos/onlinereview/actions/projectdetails/BaseProjectDetailsAction.java
+++ b/src/java/main/com/cronos/onlinereview/actions/projectdetails/BaseProjectDetailsAction.java
@@ -3,27 +3,6 @@
  */
 package com.cronos.onlinereview.actions.projectdetails;
 
-import java.io.BufferedReader;
-import java.io.Closeable;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.amazonaws.services.s3.AmazonS3URI;
-
 import com.cronos.onlinereview.Constants;
 import com.cronos.onlinereview.actions.DynamicModelDrivenAction;
 import com.cronos.onlinereview.actions.event.EventBusServiceClient;
@@ -32,7 +11,13 @@
 import com.cronos.onlinereview.model.DynamicModel;
 import com.cronos.onlinereview.model.FormFile;
 import com.cronos.onlinereview.phases.AmazonSNSHelper;
-import com.cronos.onlinereview.util.*;
+import com.cronos.onlinereview.util.ActionsHelper;
+import com.cronos.onlinereview.util.AuthorizationHelper;
+import com.cronos.onlinereview.util.ConfigHelper;
+import com.cronos.onlinereview.util.CorrectnessCheckResult;
+import com.cronos.onlinereview.util.LoggingHelper;
+import com.cronos.onlinereview.util.LookupHelper;
+import com.cronos.onlinereview.util.StrutsRequestParser;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -68,12 +53,29 @@
 import com.topcoder.util.errorhandling.BaseException;
 import com.topcoder.util.file.DocumentGenerator;
 import com.topcoder.util.file.Template;
-import com.topcoder.util.file.fieldconfig.Condition;
 import com.topcoder.util.file.fieldconfig.Field;
 import com.topcoder.util.file.fieldconfig.Node;
 import com.topcoder.util.file.fieldconfig.TemplateFields;
 import com.topcoder.util.file.templatesource.FileTemplateSource;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedReader;
+import java.io.Closeable;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * This is the base class for project details actions classes. It provides the
  * basic functions which will be used by all project detail actions.
@@ -200,7 +202,7 @@ protected CorrectnessCheckResult checkForCorrectUploadId(HttpServletRequest requ
     protected void processSubmissionDownload(Upload upload, HttpServletRequest request, HttpServletResponse response)
             throws UploadPersistenceException, SearchBuilderException, DisallowedDirectoryException,
             ConfigurationException, PersistenceException, FileDoesNotExistException, IOException,
-            ResourcePersistenceException {
+            ResourcePersistenceException, BaseException {
 
         // At this point, redirect-after-login attribute should be removed (if it
         // exists)
@@ -240,20 +242,22 @@ protected void processSubmissionDownload(Upload upload, HttpServletRequest reque
 
             outputDownloadedFile(uploadedFile, contentDisposition, response);
         } else {
-            AmazonS3URI s3Uri = ActionsHelper.isS3Url(upload.getUrl());
-            if (s3Uri == null) {
-                response.sendRedirect(upload.getUrl());
-            } else {
-                String key = s3Uri.getKey();
-                String contentDisposition;
-                if (submission != null) {
-                    contentDisposition = "attachment; filename=\"submission-" + submission.getId() + "-" + key + "\"";
-                } else {
-                    contentDisposition = "attachment; filename=\"upload-" + upload.getId() + "-" + key + "\"";
-                }
-
-                ActionsHelper.outputDownloadS3File(upload.getUrl(), key, contentDisposition, response);
-            }
+//            AmazonS3URI s3Uri = ActionsHelper.isS3Url(upload.getUrl());
+//            if (s3Uri == null) {
+//                response.sendRedirect(upload.getUrl());
+//            } else {
+//                String key = s3Uri.getKey();
+//                String contentDisposition;
+//                if (submission != null) {
+//                    contentDisposition = "attachment; filename=\"submission-" + submission.getId() + "-" + key + "\"";
+//                } else {
+//                    contentDisposition = "attachment; filename=\"upload-" + upload.getId() + "-" + key + "\"";
+//                }
+//
+//                ActionsHelper.outputDownloadS3File(upload.getUrl(), key, contentDisposition, response);
+//            }
+           // HttpResponse submissionFromApi = ActionsHelper.downloadSubmissionFromApi(submission.getId());
+            ActionsHelper.outputDownloadFromSubmissionApi(submission.getId(), response);
         }
     }
 
diff --git a/src/java/main/com/cronos/onlinereview/util/ActionsHelper.java b/src/java/main/com/cronos/onlinereview/util/ActionsHelper.java
index 5ad9a5c80a..ac93a681d5 100644
--- a/src/java/main/com/cronos/onlinereview/util/ActionsHelper.java
+++ b/src/java/main/com/cronos/onlinereview/util/ActionsHelper.java
@@ -3,46 +3,11 @@
  */
 package com.cronos.onlinereview.util;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.net.URL;
-import java.rmi.RemoteException;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Types;
-import java.text.Format;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import com.amazonaws.auth.PropertiesCredentials;
 import com.amazonaws.services.s3.AmazonS3Client;
-import com.amazonaws.services.s3.model.AmazonS3Exception;
+import com.amazonaws.services.s3.AmazonS3URI;
 import com.amazonaws.services.s3.model.GetObjectRequest;
 import com.amazonaws.services.s3.model.S3Object;
-import com.amazonaws.services.s3.AmazonS3URI;
-
-import javax.ejb.CreateException;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.cronos.onlinereview.Constants;
 import com.cronos.onlinereview.dataaccess.ProjectDataAccess;
 import com.cronos.onlinereview.dataaccess.ResourceDataAccess;
@@ -58,6 +23,8 @@
 import com.cronos.termsofuse.dao.ProjectTermsOfUseDao;
 import com.cronos.termsofuse.dao.TermsOfUseDao;
 import com.cronos.termsofuse.dao.UserTermsOfUseDao;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.TextProvider;
@@ -131,6 +98,47 @@
 import com.topcoder.web.common.throttle.Throttle;
 import com.topcoder.web.ejb.forums.Forums;
 import com.topcoder.web.ejb.forums.ForumsHome;
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpHeaders;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
+
+import javax.ejb.CreateException;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.net.URI;
+import java.net.URL;
+import java.rmi.RemoteException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Types;
+import java.text.Format;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 
 /**
  * <p>
@@ -242,6 +250,23 @@ public class ActionsHelper {
      */
     private static final String s3BucketDmz;
 
+    /**
+     * Submission Api endpoint
+     */
+    private static final String submissionApiUrl;
+
+    /**
+     * Submission api get submission
+     */
+    private static final String GET_SUBMISSION_ENDPOINT = "%s/submissions?legacySubmissionId=%s";
+
+    /**
+     * Submission Api download submission
+     */
+    private static final String GET_DOWNLOAD_ENDPOINT = "%s/submissions/%s/download";
+
+    protected static final ObjectMapper objectMapper = new ObjectMapper();
+
     static {
         try {
             ClassLoader loader = ActionsHelper.class.getClassLoader();
@@ -250,11 +275,14 @@ public class ActionsHelper {
             s3BucketDmz = ConfigHelper.getS3BucketDmz();
             presignedExpireMillis = ConfigHelper.getPreSignedExpTimeMilis();
             s3Client = new AmazonS3Client(new PropertiesCredentials(new File(credentialURL.getFile())));
+            String sUrl = ConfigHelper.getSubmissionApiEndpoint().trim();
+            submissionApiUrl = sUrl.endsWith("/") ? sUrl.substring(0, sUrl.length() -1 ) : sUrl;
         } catch (Throwable e) {
             throw new RuntimeException("Failed load to Amazon S3 CLient", e);
         }
     }
 
+
     /**
      * This constructor is declared private to prohibit instantiation of the
      * <code>ActionsHelper</code> class.
@@ -3803,25 +3831,7 @@ public static void outputDownloadS3File(String url, String key, String contentDi
 
             response.flushBuffer();
 
-            OutputStream out = null;
-
-            try {
-                out = response.getOutputStream();
-                byte[] buffer = new byte[65536];
-
-                for (;;) {
-                    int numOfBytesRead = in.read(buffer);
-                    if (numOfBytesRead == -1) {
-                        break;
-                    }
-                    out.write(buffer, 0, numOfBytesRead);
-                }
-            } finally {
-                in.close();
-                if (out != null) {
-                    out.close();
-                }
-            }
+            pipeInputStreamToOutputStream(in, response.getOutputStream());
         } catch (Exception e) {
             log.log(Level.ERROR, "ex: " + e.getMessage());
             throw new IOException("Error S3 download", e);
@@ -3878,4 +3888,87 @@ public static String createStudioLocalFilePath(long projectId, long userId, Stri
         buf.append(parameter);
         return buf.toString();
     }
+
+    /**
+     * Get submission from external API
+     *
+     * @param submissionId submissionId
+     * @throws Exception
+     */
+    public static void outputDownloadFromSubmissionApi(long submissionId,
+                                                       HttpServletResponse servletResponse) throws BaseException {
+        HttpResponse response = null;
+        DefaultHttpClient httpClient = null;
+        try {
+            httpClient = new DefaultHttpClient();
+            log.log(Level.INFO, "Get submission from api id: " + submissionId);
+            HttpGet request = new HttpGet(String.format(GET_SUBMISSION_ENDPOINT, submissionApiUrl, submissionId));
+            String v3Token = new JwtTokenUpdater().check().getToken();
+
+            request.setHeader(HttpHeaders.AUTHORIZATION, "Bearer " + v3Token);
+            request.addHeader(HttpHeaders.ACCEPT, "application/json");
+            response = httpClient.execute(request);
+            HttpEntity entity = response.getEntity();
+
+            if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
+                throw new BaseException("Unable submission from the API:" + response.getStatusLine().getReasonPhrase());
+            }
+            JsonNode result = objectMapper.readTree(entity.getContent());
+
+            if (result.size() < 1) {
+             throw new BaseException("Can not found submission from API");
+            }
+            String v5SubmissionId = result.get(0).get("id").asText();
+            log.log(Level.INFO, "Found submission id: " + v5SubmissionId);
+            request.setURI(new URI(String.format(GET_DOWNLOAD_ENDPOINT, submissionApiUrl, v5SubmissionId)));
+            response = httpClient.execute(request);
+            if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
+                throw new BaseException("Unable to download submission from the API:" + response.getStatusLine().getReasonPhrase());
+            }
+            log.log(Level.INFO, "begin downloading submission: " + v5SubmissionId);
+            InputStream in = response.getEntity().getContent();
+
+            servletResponse.setHeader("Content-Type", response.getEntity().getContentType().getValue());
+            servletResponse.setStatus(HttpServletResponse.SC_OK);
+            servletResponse.setIntHeader("Content-Length", (int) response.getEntity().getContentLength());
+
+            Header[] headers = response.getHeaders("Content-Disposition");
+            String filename = "submission-" + submissionId + ".zip";
+            if (headers.length > 0) {
+                filename = headers[0].getValue();
+            }
+
+            servletResponse.setHeader("Content-Disposition", filename);
+
+            servletResponse.flushBuffer();
+            pipeInputStreamToOutputStream(in, servletResponse.getOutputStream());
+
+        } catch(Exception e) {
+            log.log(Level.ERROR, "Fail to get submission file for submissionId " + submissionId + "ex: " + e.getMessage());
+            throw new BaseException("Fail to get submission file for submissionId " + submissionId, e);
+        }
+    }
+
+    /**
+     * Pipe inputstream to outputstream
+     *
+     * @param in inputstream
+     * @param out outputstream
+     * @throws IOException
+     */
+    private static void pipeInputStreamToOutputStream(InputStream in, OutputStream out) throws IOException {
+        try {
+            byte[] buffer = new byte[65536];
+            for (;;) {
+                int numOfBytesRead = in.read(buffer);
+                if (numOfBytesRead == -1) {
+                    break;
+                }
+                out.write(buffer, 0, numOfBytesRead);
+            }
+        } finally {
+            if (in != null) in.close();
+            if (out != null) out.close();
+        }
+    }
 }
diff --git a/src/java/main/com/cronos/onlinereview/util/ConfigHelper.java b/src/java/main/com/cronos/onlinereview/util/ConfigHelper.java
index f55c00767c..70f098f9d5 100644
--- a/src/java/main/com/cronos/onlinereview/util/ConfigHelper.java
+++ b/src/java/main/com/cronos/onlinereview/util/ConfigHelper.java
@@ -1056,6 +1056,11 @@ public class ConfigHelper {
      */
     private static String s3Bucket;
 
+    /**
+     * Submission Api endpoint
+     */
+    private static String submissionApiEndpoint;
+
     /**
      * AWS S3 bucket for DMZ
      */
@@ -1693,6 +1698,7 @@ public class ConfigHelper {
             Property awsS3 = cfgMgr.getPropertyObject(ONLINE_REVIEW_CFG_NS, "aws_s3");
             s3Bucket = awsS3.getValue("bucket");
             s3BucketDmz = awsS3.getValue("bucket_dmz");
+            submissionApiEndpoint = cfgMgr.getString(ONLINE_REVIEW_CFG_NS, "submission_api");
             try {
                 preSignedExpTimeMilis = Long.parseLong(awsS3.getValue("expire"));
             } catch (Exception e) {
@@ -2642,6 +2648,10 @@ public static String getS3Bucket() {
         return s3Bucket;
     }
 
+    public static String getSubmissionApiEndpoint() {
+        return submissionApiEndpoint;
+    }
+
     /**
      * Get S3 bucket DMZ
      * @return s3 bucket dmz name
diff --git a/token.properties.example b/token.properties.example
index cfba473f47..d03a3b80a5 100644
--- a/token.properties.example
+++ b/token.properties.example
@@ -197,8 +197,8 @@
 @tests.competitorusername@=user
 @tests.competitoruserpassword@=password
 @tests.competitoruserid@=132458
-@tests.timeout@=5000
 
+@tests.timeout@=5000
 #####################################
 # Parameters specific to Auto Pilot #
 #####################################
@@ -262,3 +262,4 @@
 @aws_s3_expire@=3600000
 @aws_s3_access_key@=
 @aws_s3_secret_key@=
+@submission_api_endpoint@=http://localhost:3000/v5/