diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index e96534f..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 4c4921c..c604771 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'com.jetbrains'
-version '1.1-SNAPSHOT'
+version '1.3-SNAPSHOT'
 
 apply plugin: 'java'
 
@@ -11,7 +11,7 @@ sourceCompatibility = 1.8
 
 repositories {
     mavenCentral()
-}
+};
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
diff --git a/src/main/resources/static-analyzer/applications/generate_dataflow_log.py b/src/main/resources/static-analyzer/applications/generate_dataflow_log.py
index dd6b081..fe6a3fc 100644
--- a/src/main/resources/static-analyzer/applications/generate_dataflow_log.py
+++ b/src/main/resources/static-analyzer/applications/generate_dataflow_log.py
@@ -2,8 +2,13 @@ import glob
 import os
 import sys
 import subprocess
+import thread
+from multiprocessing import Process
+
 apppath = "./%s"%(sys.argv[1])
 non_dirs = ['controllers']
+def os_exe(cmd):
+	os.system(cmd)
 #df = open("df.sh", "w")
 for root, dirs, files in os.walk(apppath):
 	for filename in files:
@@ -30,7 +35,11 @@ for root, dirs, files in os.walk(apppath):
 				os.system("mkdir -p %s"%dir_name)
 			print "\tdes_file = %s"%des_file
 			print "jrubyc %s > %s"%(fname, des_file)
-			os.system("jrubyc %s >> %s"%(fname, des_file))
+			cmd = "jrubyc %s >> %s"%(fname, des_file)
+			os.system("jrubyc %s >> %s &"%(fname, des_file))
+			#p = Process(target=os_exe, args=(cmd,))
+			#p.start()
+			#p.join()
 			#df.write("jrubyc %s > %s\n"%(fname, des_file))
 			#df.write("rm %s\n"%fname.replace(".rb",".class"))
 			os.system("rm %s"%fname.replace(".rb",".class"))
diff --git a/src/main/resources/static-analyzer/controller_model_analysis/compute_loop_invariant.rb b/src/main/resources/static-analyzer/controller_model_analysis/compute_loop_invariant.rb
index 91ea856..7036a18 100644
--- a/src/main/resources/static-analyzer/controller_model_analysis/compute_loop_invariant.rb
+++ b/src/main/resources/static-analyzer/controller_model_analysis/compute_loop_invariant.rb
@@ -161,7 +161,7 @@ def compute_loop_invariant(file)
 
 	end
 
-	puts "the number of loop in query is : #{@results.length}" if @results.length > 0
+	puts "The number of loop in query is : #{@results.length}" if @results.length > 0
 	result_group_cl = @results.group_by{|re| re[1]}
 	cnt = 1
 	result_group_cl.each do |cl, res|
diff --git a/src/main/resources/static-analyzer/controller_model_analysis/compute_stats.rb b/src/main/resources/static-analyzer/controller_model_analysis/compute_stats.rb
index 5cc5424..ba105f6 100644
--- a/src/main/resources/static-analyzer/controller_model_analysis/compute_stats.rb
+++ b/src/main/resources/static-analyzer/controller_model_analysis/compute_stats.rb
@@ -4,8 +4,8 @@ def compute_dataflow_stat(output_dir, start_class, start_function, build_node_li
 	$cs = 1
 	$li = 1
 	$ir = 1
-	$ds = 1
-	$rd = 0
+	$ds = 0
+	$rd = 1
 	system("mkdir #{output_dir}")
 	graph_fname = "#{output_dir}/stats.xml"
 	$graph_file = File.open(graph_fname, "w")
diff --git a/src/main/resources/static-analyzer/controller_model_analysis/main.rb b/src/main/resources/static-analyzer/controller_model_analysis/main.rb
index 2ff65e7..56b8d2c 100644
--- a/src/main/resources/static-analyzer/controller_model_analysis/main.rb
+++ b/src/main/resources/static-analyzer/controller_model_analysis/main.rb
@@ -229,13 +229,18 @@ if options[:inference] == true
 	$type_inference = true
 end
 
+tstart = Time.now
+puts "Start #{tstart}"
+
 if options[:dir] != nil
 	puts "dir = #{options[:dir]}"
 	if options[:template] != nil
 		read_ruby_files_with_template(options[:dir], options[:template])
 	else
 		$app_dir = options[:dir]
-		read_ruby_files(options[:dir])
+		t1 = Time.now 
+		read_ruby_files
+		puts "read_ruby_files: #{Time.now - t1}"
 		puts "Finish reading files"
 	
 		#$class_map.each do |k, v|
@@ -249,7 +254,12 @@ if options[:dir] != nil
 		#	end
 		#end
 		t1 = Time.now
-		read_dataflow(options[:dir])
+		if options[:stats]
+			fn = options[:trace][0]
+			read_dataflow(options[:dir], fn)
+		else
+			read_dataflow(options[:dir])
+		end
 		puts "read_dataflow: #{Time.now - t1}"
 		t1 = Time.now
 		do_type_inference
@@ -474,8 +484,6 @@ if options[:print_all] == true
 =end
 	#end
 end
-tstart = Time.now
-puts "Start #{tstart}"
 if options[:run_all]
 	system("rm -rf #{$app_dir}/#{$results_dir}/")
 	system("mkdir #{$app_dir}/#{$results_dir}/")
diff --git a/src/main/resources/static-analyzer/controller_model_analysis/read_dataflow_log.rb b/src/main/resources/static-analyzer/controller_model_analysis/read_dataflow_log.rb
index ec50349..0709e16 100644
--- a/src/main/resources/static-analyzer/controller_model_analysis/read_dataflow_log.rb
+++ b/src/main/resources/static-analyzer/controller_model_analysis/read_dataflow_log.rb
@@ -9,7 +9,7 @@ def find_first_nonempty_ele(attrs)
 	return -1	
 end
 
-def read_dataflow(application_dir=nil)
+def read_dataflow(application_dir=nil,fn=nil)
 
 	if application_dir != nil
 		$app_dir = application_dir
@@ -24,6 +24,9 @@ def read_dataflow(application_dir=nil)
 			#puts "Dataflow file: #{filename} matches class name #{class_name}" 
 			if class_name != nil
 				if filename.to_s.include?("controllers")
+					if fn and !filename.to_s.include?fn
+						#next
+					end
 					$class_map[class_name].class_type = "controller"
 				elsif filename.to_s.include?("models")
 					$class_map[class_name].class_type = "model"
