diff --git a/app.js b/app.js
index b8911bd09864297e95b7dbf0c75add1892badc7e..8caedcc11eee3caa2f19736b0bf90d43da054c58 100644
--- a/app.js
+++ b/app.js
@@ -20,7 +20,6 @@ const downloadNames = Object.keys(downloadFiles);
 //load functions for frontend and backend build
 let backendFunctions = require('./backendFunctions.js');
 let frontendFunctions = require('./frontendFunctions.js');
-let zipFunctions = require('./zipFunctions.js');
 
 var app = express();
 
@@ -145,10 +144,11 @@ function streamFilesToZip(promiseArray){
 	console.log('in streamFilesToZip');
 
 	return new Promise((resolve,reject)=> {
+		let finishedArray=[];
 		console.log('promiseArray in streamFilesToZip before Promise.all:', promiseArray);
 		Promise.all(promiseArray).then(files => {
 			console.log('in Promise.all, files:', files);
-			let finishedArray=[];
+			
 			files.forEach(file => {
 				if (file.zipFileName === 'backend.war'){
 
@@ -182,10 +182,7 @@ function streamFilesToZip(promiseArray){
 
 					})
 
-					if(finishedArray.length === files.length){
-						console.log('before resolve() in backend.war');
-						resolve();
-					}
+					
 
 
 
@@ -201,10 +198,8 @@ function streamFilesToZip(promiseArray){
 						}
 
 					}).on('finish', function(){
-						finishedArray.push('frontend finished');
-						if(finishedArray.length === files.length){
-							resolve();
-						}
+						resolve(finishedArray.push('frontend finished'));
+					
 					})
 
 				}
@@ -214,7 +209,10 @@ function streamFilesToZip(promiseArray){
 			})
 
 		})
-
+if(finishedArray.length === files.length){
+						console.log('before resolve() in streamFilesToZip');
+						resolve();
+					}
 
 	})
 };