diff --git a/AlgebraicDataflowArchitectureModel/models/WOS.dtram b/AlgebraicDataflowArchitectureModel/models/WOS.dtram
index 6b79a46..139559f 100644
--- a/AlgebraicDataflowArchitectureModel/models/WOS.dtram
+++ b/AlgebraicDataflowArchitectureModel/models/WOS.dtram
@@ -15,18 +15,17 @@
 }
 }
 geometry {
-node c C1:150,20,30,30
-node c C2:150,20,30,30
-node r highest:300,20,80,30
-node r temp_c:20,20,80,30
-node r temp_f:370,220,80,30
-node ioc CIO2:160,150,30,30
-node ioc CIO1:140,170,30,30
+	node c C1:500,200,30,30
+	node c C2:500,100,30,30
+	node r highest:650,100,80,30
+	node r temp_c:650,200,80,30
+	node r temp_f:250,100,80,30
+	node ioc CIO2:100,300,30,30
+	node ioc CIO1:100,100,30,30
 }
-
-services{
+services {
 	service A{
-		baseURL:https
-		resources:temp_f,temp_c,highest
+		baseURL:http
+		resources:highest, temp_c, temp_f
 	}
-}
\ No newline at end of file
+}
diff --git a/AlgebraicDataflowArchitectureModel/models/WeatherObservationSystem.model b/AlgebraicDataflowArchitectureModel/models/WeatherObservationSystem.model
index 0a14140..2cd84d7 100644
--- a/AlgebraicDataflowArchitectureModel/models/WeatherObservationSystem.model
+++ b/AlgebraicDataflowArchitectureModel/models/WeatherObservationSystem.model
@@ -1,17 +1,14 @@
-channel CIO1 {
-	out temp_f(p:Double, observe(x)) == x
-}
-
 channel CIO2 {
 	out highest(h:Double, reset(v)) == v
 }
-
+channel CIO1 {
+	out temp_f(p:Double, observe(x)) == x
+}
 channel C1{
 	in  temp_f(q:Double, conversion(y)) == y
 	out temp_c(r:Double, conversion(z)) == (z-32) / 1.8
 }
-
 channel C2{
 	in temp_f(q:Double, update(y)) == y
 	out highest(h:Double, update(z)) == if(gt(z, h), z, h)
-}
\ No newline at end of file
+}
diff --git a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/SaveAsAction.java b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/SaveAsAction.java
index f9db012..d8ce78e 100644
--- a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/SaveAsAction.java
+++ b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/SaveAsAction.java
@@ -69,7 +69,6 @@
 				// checking file duplicates
 				if(! (fc.getSelectedFile().exists()))  editor.setCurFilePath(fileName);	
 				
-				
 				// overwriting file
 				editor.save();
 				frame.setTitle(GraphicalRefactor.title + " - " + fc.getSelectedFile().getAbsolutePath());
diff --git a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/WebServiceEditor.java b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/WebServiceEditor.java
index b2b31ab..0c16bdd 100644
--- a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/WebServiceEditor.java
+++ b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/WebServiceEditor.java
@@ -135,34 +135,33 @@
 						filewriter.write(toOutputString());
 						filewriter.write("services {\n");
 	
-						// serviceNameが変わるまでリソースのリストに追加
-						// serviceNameが変わったらキャッシュ
-						// サービス名とURLとリソースを書き出す
-						filewriter.write("\tservice " + "SERVICE_NAME" + "{\n");
-						filewriter.write("\t\tbaseURL :\n");
-						filewriter.write("\t\tresources: ");
-	
-						Object root = graph.getDefaultParent();
-						for (int i = 0; i < graph.getModel().getChildCount(root); i++) {
-							Object cell = graph.getModel().getChildAt(root, i);
-	
-							if (graph.getModel().isVertex(cell)) {
-								mxGraphView view = graph.getView();
-								mxCellState cellState = view.getState(cell);
-	
-								// get resource's name
-								for (Iterator<IdentifierTemplate> itr = model.getIdentifierTemplates().iterator(); itr.hasNext();){
-									IdentifierTemplate resource = itr.next();
-	
-									if( !(resource instanceof IdentifierTemplate)) continue;
-									if( !cellState.getLabel().equals(resource.getResourceName())) continue;
-	
-									filewriter.write(resource.getResourceName());								
-									if(itr.hasNext()) filewriter.write(", ");								
+						for(Service service : this.webServicesInfo.getServices()) {
+							filewriter.write("\tservice " + service.getName() + "{\n");
+							filewriter.write("\t\tbaseURL:" + service.getBaseURL() +"\n");
+							filewriter.write("\t\tresources:");
+		
+							Object root = graph.getDefaultParent();
+							for (int i = 0; i < graph.getModel().getChildCount(root); i++) {
+								Object cell = graph.getModel().getChildAt(root, i);
+		
+								if (graph.getModel().isVertex(cell)) {
+									mxGraphView view = graph.getView();
+									mxCellState cellState = view.getState(cell);
+		
+									// get resource's name
+									for (Iterator<IdentifierTemplate> itr = model.getIdentifierTemplates().iterator(); itr.hasNext();){
+										IdentifierTemplate resource = itr.next();
+		
+										if( !(resource instanceof IdentifierTemplate)) continue;
+										if( !cellState.getLabel().equals(resource.getResourceName())) continue;
+		
+										filewriter.write(resource.getResourceName());								
+										if(itr.hasNext()) filewriter.write(", ");								
+									}
 								}
 							}
+							filewriter.write("\n\t}\n");
 						}
-						filewriter.write("\n\t}\n");
 						// end loop
 						filewriter.write("}\n");
 						filewriter.close();
diff --git a/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAMForWebService.java b/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAMForWebService.java
index 6de9a62..38c4b1d 100644
--- a/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAMForWebService.java
+++ b/AlgebraicDataflowArchitectureModel/src/parser/ParserDTRAMForWebService.java
@@ -104,7 +104,7 @@
 
 			if (!isMatchKeyword(stream.next(), RIGHT_CURLY_BRACKET)) throw new ExpectedRightBracket(stream.getLine());
 
-			serviceTokenNode = stream.next(); // here stores "}" token.
+			serviceTokenNode = stream.next(); // serviceTokenNode'll store "}" token.
 		}
 
 		if (!isMatchKeyword(serviceTokenNode, RIGHT_CURLY_BRACKET)) throw new ExpectedRightBracket(stream.getLine());