diff --git a/AlgebraicDataflowArchitectureModel/models/Algolike.model b/AlgebraicDataflowArchitectureModel/models/Algolike.model
index 97aef04..8ea8dc2 100644
--- a/AlgebraicDataflowArchitectureModel/models/Algolike.model
+++ b/AlgebraicDataflowArchitectureModel/models/Algolike.model
@@ -6,25 +6,25 @@
 	guessB := 0
 }
 channel targetAInput{
-	out targetA(t:Int, setTargetA(a:Int)) == a
+	out targetA(t:Int, setTargetA(a:Int)) = a
 }
 channel targetBInput{
-	out targetB(t:Int, setTargetB(b:Int)) == b
+	out targetB(t:Int, setTargetB(b:Int)) = b
 }
 channel attackerAInput{
-	out attackerA(t:Int, setAttackerA(a:Int)) == a
+	out attackerA(t:Int, setAttackerA(a:Int)) = a
 }
 channel attackerBInput{
-	out attackerB(t:Int, setAttackerB(b:Int)) == b
+	out attackerB(t:Int, setAttackerB(b:Int)) = b
 }
 channel guessAInput{
-	out guessA(t:Int, setGuessA(a:Int)) == a
+	out guessA(t:Int, setGuessA(a:Int)) = a
 }
 channel guessBInput{
-	out guessB(t:Int, setGuessB(b:Int)) == b
+	out guessB(t:Int, setGuessB(b:Int)) = b
 }
 channel addDeck{
-	out deck(d:List, addCard(num:Integer)) == cons(tuple(num, false), d)
+	out deck(d:List, addCard(num:Integer)) = cons(tuple(num, false), d)
 }
 
 channel drawAInput{
@@ -32,21 +32,21 @@
 	ref targetA(t:Int, drawAndAttackA(t, g, b))
 	ref guessA(g:Int, drawAndAttackA(t, g, b))
 	ref	handsB(b:List, drawAndAttackA(t, g, b))
-	out	resultByDrawingA(sda:Tuple, drawAndAttackA(t, g, b)) == tuple(eq(fst(get(b, t)), g), t)
+	out	resultByDrawingA(sda:Tuple, drawAndAttackA(t, g, b)) = tuple(fst(get(b, t)) == g, t)
 }
 	
 channel inputDrawArgsA{
-	in	resultByDrawingA(sda:Tuple, drawA(sucTrg, d)) == sucTrg
+	in	resultByDrawingA(sda:Tuple, drawA(sucTrg, d)) = sucTrg
 	ref deck(d:List, drawA(sucTrg, d))
 	
-	out handsA(outA:List, drawA(sucTrg, d)) == if(fst(sucTrg),
-										sortByKey(cons(tuple(fst(head(d)),false), outA)), 
+	out handsA(outA:List, drawA(sucTrg, d)) = if(fst(sucTrg),
+										sortByKey(cons(tuple(fst(head(d)), false), outA)), 
 										sortByKey(cons(tuple(fst(head(d)), true), outA)))
 										
-	out handsB(outB:List, drawA(sucTrg, d)) == if(fst(sucTrg),
+	out handsB(outB:List, drawA(sucTrg, d)) = if(fst(sucTrg),
 										set(outB, snd(sucTrg), tuple(fst(get(outB, snd(sucTrg))), true)), 
 										outB)
-	out deck(t:List, drawA(sucTrg, d)) == tail(t)
+	out deck(t:List, drawA(sucTrg, d)) = tail(t)
 }
 
 channel selectAInput{
@@ -54,14 +54,14 @@
 	ref targetA(t:Int, selectAndAttackA(a, t, g, b))
 	ref guessA(g:Int, selectAndAttackA(a, t, g, b))
 	ref	handsB(b:List, selectAndAttackA(a, t, g, b))
-	out	resultBySelectingA(ssa:Tuple, selectAndAttackA(a, t, g, b)) == tuple(eq(fst(get(b, t)), g), t, a)
+	out	resultBySelectingA(ssa:Tuple, selectAndAttackA(a, t, g, b)) = tuple(fst(get(b, t)) == g, t, a)
 }		
 channel inputSelectArgA{
-	in resultBySelectingA(ssa, selectA(sucTrgAtk)) == sucTrgAtk
-	out handsA(outA, selectA(sucTrgAtk)) == if(fst(sucTrgAtk),
+	in resultBySelectingA(ssa, selectA(sucTrgAtk)) = sucTrgAtk
+	out handsA(outA, selectA(sucTrgAtk)) = if(fst(sucTrgAtk),
 										outA,
 										set(outA, snd(snd(sucTrgAtk)), tuple(fst(get(outA, snd(snd(sucTrgAtk)))), true)))
-	out handsB(outB, selectA(sucTrgAtk)) == if(fst(sucTrgAtk), 
+	out handsB(outB, selectA(sucTrgAtk)) = if(fst(sucTrgAtk), 
 										set(outB, fst(snd(sucTrgAtk)), tuple(fst(get(outB, fst(snd(sucTrgAtk)))), true)), 
 										outB)
 }
@@ -69,21 +69,21 @@
 	ref targetB(t:Int, drawAndAttackB(t, g, a))
 	ref guessB(g:Int, drawAndAttackB(t, g, a))
 	ref	handsA(a:List, drawAndAttackB(t, g, a))
-	out	resultByDrawingB(sdb:Tuple, drawAndAttackB(t, g, a)) == tuple(eq(fst(get(a, t)), g), t)
+	out	resultByDrawingB(sdb:Tuple, drawAndAttackB(t, g, a)) = tuple(fst(get(a, t)) == g, t)
 }
 	
 channel inputDrawArgsB{
-	in	resultByDrawingB(sdb:Tuple, drawB(sucTrg, d)) == sucTrg
+	in	resultByDrawingB(sdb:Tuple, drawB(sucTrg, d)) = sucTrg
 	ref deck(d:List, drawB(sucTrg, d))
 	
-	out handsB(outB:List, drawB(sucTrg, d)) == if(fst(sucTrg),
+	out handsB(outB:List, drawB(sucTrg, d)) = if(fst(sucTrg),
 										sortByKey(cons(tuple(fst(head(d)),false), outB)), 
 										sortByKey(cons(tuple(fst(head(d)), true), outB)))
 										
-	out handsA(outA:List, drawB(sucTrg, d)) == if(fst(sucTrg),
+	out handsA(outA:List, drawB(sucTrg, d)) = if(fst(sucTrg),
 										set(outA, snd(sucTrg), tuple(fst(get(outA, snd(sucTrg))), true)), 
 										outA)
-	out deck(t:List, drawB(sucTrg, d)) == tail(t)
+	out deck(t:List, drawB(sucTrg, d)) = tail(t)
 }
 
 channel selectBInput{
@@ -91,23 +91,23 @@
 	ref targetB(t:Int, selectAndAttackB(atk, t, g, a))
 	ref guessB(g:Int, selectAndAttackB(atk, t, g, a))
 	ref	handsA(a:List, selectAndAttackB(atk, t, g, a))
-	out	resultBySelectingB(ssb:Tuple, selectAndAttackB(atk, t, g, a)) == tuple(eq(fst(get(a, t)), g), t, atk)
+	out	resultBySelectingB(ssb:Tuple, selectAndAttackB(atk, t, g, a)) = tuple(fst(get(a, t)) == g, t, atk)
 }		
 channel inputSelectArgB{
-	in resultBySelectingB(ssb, selectB(sucTrgAtk)) == sucTrgAtk
-	out handsB(outB, selectB(sucTrgAtk)) == if(fst(sucTrgAtk),
+	in resultBySelectingB(ssb, selectB(sucTrgAtk)) = sucTrgAtk
+	out handsB(outB, selectB(sucTrgAtk)) = if(fst(sucTrgAtk),
 										outB,
 										set(outB, snd(snd(sucTrgAtk)), tuple(fst(get(outB, snd(snd(sucTrgAtk)))), true)))
-	out handsA(outA, selectB(sucTrgAtk)) == if(fst(sucTrgAtk), 
+	out handsA(outA, selectB(sucTrgAtk)) = if(fst(sucTrgAtk), 
 										set(outA, fst(snd(sucTrgAtk)), tuple(fst(get(outA, fst(snd(sucTrgAtk)))), true)), 
 										outA)
 }
 
 channel judgeA{
-	in handsA(a:List, judge(j)) == j
-	out loseA(la:Bool, judge(j)) == eq(length(extractFaceDown(j)), 0)
+	in handsA(a:List, judge(j)) = j
+	out loseA(la:Bool, judge(j)) = length(extractFaceDown(j)) == 0
 } 
 channel judgeB{
-	in handsB(b:List, judge(j)) == j
-	out loseB(lb:Bool, judge(j)) == eq(length(extractFaceDown(j)), 0)
+	in handsB(b:List, judge(j)) = j
+	out loseB(lb:Bool, judge(j)) = length(extractFaceDown(j)) == 0
 } 
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/models/Audio.dtram b/AlgebraicDataflowArchitectureModel/models/Audio.dtram
index 66862ef..55668a8 100644
--- a/AlgebraicDataflowArchitectureModel/models/Audio.dtram
+++ b/AlgebraicDataflowArchitectureModel/models/Audio.dtram
@@ -1,22 +1,22 @@
 model {
 channel CIO3 {
-	out BGMVolume(b: Double, setBGM(b2)) == b2
+	out BGMVolume(b: Double, setBGM(b2)) = b2
 }
 channel CIO2 {
-	out soundVolume(s: Double, setSound(s2)) == s2
+	out soundVolume(s: Double, setSound(s2)) = s2
 }
 channel CIO1 {
-	out audioVolume(a: Double, setAudio(a2)) == a2
+	out audioVolume(a: Double, setAudio(a2)) = a2
 }
 channel C1 {
-	in audioVolume(a, calc(a2, s2)) == a2
-	in soundVolume(s, calc(a2, s2)) == s2
-	out outputSoundVolume(os, calc(a2, s2)) == a2 * s2
+	in audioVolume(a, calc(a2, s2)) = a2
+	in soundVolume(s, calc(a2, s2)) = s2
+	out outputSoundVolume(os, calc(a2, s2)) = a2 * s2
 }
 channel C2 {
-	in audioVolume(a, calc(a2, b2)) == a2
-	in BGMVolume(b, calc(a2, b2)) == b2
-	out outputBGMVolume(ob, calc(a2, b2)) == a2 * b2
+	in audioVolume(a, calc(a2, b2)) = a2
+	in BGMVolume(b, calc(a2, b2)) = b2
+	out outputBGMVolume(ob, calc(a2, b2)) = a2 * b2
 }
 }
 geometry {
diff --git a/AlgebraicDataflowArchitectureModel/models/Base.model b/AlgebraicDataflowArchitectureModel/models/Base.model
index ac44843..bb460e4 100644
--- a/AlgebraicDataflowArchitectureModel/models/Base.model
+++ b/AlgebraicDataflowArchitectureModel/models/Base.model
@@ -1,13 +1,13 @@
 channel CIO{
-	out r1(x1:Int, set1(y1:Int)) == y1
-	out r1(x1, e) == x1
+	out r1(x1:Int, set1(y1:Int)) = y1
+	out r1(x1, e) = x1
 }
 channel CIO2{
-	out r2(x2:Int, set2(y2:Int)) == y2
-	out r2(x2, e) == x2
+	out r2(x2:Int, set2(y2:Int)) = y2
+	out r2(x2, e) = x2
 }
 channel C1{
-	in r1(x1, update(x1:Int, y1:Int, x2:Int, y2:Int)) == y1
-	in r2(x2, update(x1, y1, x2, y2)) == y2
-	out r3(x3:Int, update(x1, y1, x2, y2)) == x1 + y1 + x2 + y2
+	in r1(x1, update(x1:Int, y1:Int, x2:Int, y2:Int)) = y1
+	in r2(x2, update(x1, y1, x2, y2)) = y2
+	out r3(x3:Int, update(x1, y1, x2, y2)) = x1 + y1 + x2 + y2
 }
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/models/Clock.dtram b/AlgebraicDataflowArchitectureModel/models/Clock.dtram
index ae2169e..ec23d75 100644
--- a/AlgebraicDataflowArchitectureModel/models/Clock.dtram
+++ b/AlgebraicDataflowArchitectureModel/models/Clock.dtram
@@ -1,18 +1,18 @@
 model {
 	channel CIO1 {
-	   out min(m: Double, tick) == mod(m + 1, 60)
+		out min(m: Int, tick) = (m + 1) % 60
 	}
 	channel Clock {
-	   in min(m, update(m2)) == m2
-	   out hour(h: Double, update(m2)) == if(eq(m2, 0), mod(h + 1, 24), h)
+		in min(m, update(m2)) = m2
+		out hour(h: Int, update(m2)) = if(m2 == 0, (h + 1) % 24, h)
 	}
 	channel MinUpdate {
-	   in min(m, update(m2)) == m2
-	   out min_ang(m_ang: Double, update(m2)) == m2 / 30 * PI
+		in min(m, update(m2)) = m2
+		out min_ang(m_ang: Double, update(m2)) = m2 / 30 * PI
 	}
 	channel HourUpdate {
-	   in hour(h, update(h2)) == h2
-	   out hour_ang(h_ang: Double, update(h2)) == h2 / 6 * PI
+		in hour(h, update(h2)) = h2
+		out hour_ang(h_ang: Double, update(h2)) = h2 / 6 * PI
 	}
 }
 geometry {
diff --git a/AlgebraicDataflowArchitectureModel/models/CustomerOffice.model b/AlgebraicDataflowArchitectureModel/models/CustomerOffice.model
index f140bff..dced55e 100644
--- a/AlgebraicDataflowArchitectureModel/models/CustomerOffice.model
+++ b/AlgebraicDataflowArchitectureModel/models/CustomerOffice.model
@@ -1,33 +1,33 @@
 channel C_CustomerAOff_In {
-	out customerA_off(c:String, setOff(x)) == x
-	out customerA_off(c, e) == c
+	out customerA_off(c:String, setOff(x)) = x
+	out customerA_off(c, e) = c
 }
 
 channel C_CustomerBOff_In {
-	out customerB_off(c:String, setOff(x)) == x
-	out customerB_off(c, e) == c
+	out customerB_off(c:String, setOff(x)) = x
+	out customerB_off(c, e) = c
 }
 
 channel C_CompanyC1Add_In {
-	out companyC1_add(a:String, setAdd(y)) == y
-	out companyC1_add(a, e) == a
+	out companyC1_add(a:String, setAdd(y)) = y
+	out companyC1_add(a, e) = a
 }
 
 channel C_CompanyC2Add_In {
-	out companyC2_add(a:String, setAdd(y)) == y
-	out companyC2_add(a, e) == a
+	out companyC2_add(a:String, setAdd(y)) = y
+	out companyC2_add(a, e) = a
 }
 
 channel CA {
-	in customerA_off(c, sync(z, u, v)) == z
-	in companyC1_add(a1, sync(z, u, v)) == u
-	in companyC2_add(a2, sync(z, u, v)) == v
-	out customerA_add(a3:String, sync(z, u, v)) == if(eq(z, C1), u, if(eq(z, C2), v, null))
+	in customerA_off(c, sync(z, u, v)) = z
+	in companyC1_add(a1, sync(z, u, v)) = u
+	in companyC2_add(a2, sync(z, u, v)) = v
+	out customerA_add(a3:String, sync(z, u, v)) = if(z == C1, u, if(z == C2, v, null))
 }
 
 channel CB {
-	in customerB_off(c, sync(z, u, v)) == z
-	in companyC1_add(a1, sync(z, u, v)) == u
-	in companyC2_add(a2, sync(z, u, v)) == v
-	out customerB_add(a3:String, sync(z, u, v)) == if(eq(z, C1), u, if(eq(z, C2), v, null))
+	in customerB_off(c, sync(z, u, v)) = z
+	in companyC1_add(a1, sync(z, u, v)) = u
+	in companyC2_add(a2, sync(z, u, v)) = v
+	out customerB_add(a3:String, sync(z, u, v)) = if(z == C1, u, if(z == C2, v, null))
 }
diff --git a/AlgebraicDataflowArchitectureModel/models/Game.model b/AlgebraicDataflowArchitectureModel/models/Game.model
index bc90ba4..1952ff0 100644
--- a/AlgebraicDataflowArchitectureModel/models/Game.model
+++ b/AlgebraicDataflowArchitectureModel/models/Game.model
@@ -1,32 +1,32 @@
 channel CIO {
-	out force(f:Double, action(x:Double)) == x
-	out time(t:Double, action(x)) == t + 0.01
-	out force(f, e) == x
-	out time(t, e) == t + 0.01
+	out force(f:Double, action(x:Double)) = x
+	out time(t:Double, action(x)) = t + 0.01
+	out force(f, e) = x
+	out time(t, e) = t + 0.01
 }
 
 channel CIO2 {
-	out velocity(v:Double, setVel(x:Double)) == x
-	out velocity(v, e) == x
+	out velocity(v:Double, setVel(x:Double)) = x
+	out velocity(v, e) = x
 }
 
 channel CIO3 {
-	out mass(m:Double, setMass(x:Double)) == x
-	out mass(m, e) == m
+	out mass(m:Double, setMass(x:Double)) = x
+	out mass(m, e) = m
 }
 
 channel C1 {
-	in force(f, update1(y, z)) == y
-	in mass(m, update1(y, z)) == z
-	out acceleration(a: Double, update1(y, z)) == y / z
+	in force(f, update1(y, z)) = y
+	in mass(m, update1(y, z)) = z
+	out acceleration(a: Double, update1(y, z)) = y / z
 }
 
 channel C2 {
-	in acceleration(a, update2(z)) == z
-	out velocity(v:Double, update2(z)) == v + 0.01 * z
+	in acceleration(a, update2(z)) = z
+	out velocity(v:Double, update2(z)) = v + 0.01 * z
 }
 
 channel C3 {
-	in velocity(v, update3(u)) == u
-	out position(p:Double, update3(u)) == p + 0.01 * u
+	in velocity(v, update3(u)) = u
+	out position(p:Double, update3(u)) = p + 0.01 * u
 }
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/models/JumpGame.model b/AlgebraicDataflowArchitectureModel/models/JumpGame.model
index 4c24a56..43b8d0c 100644
--- a/AlgebraicDataflowArchitectureModel/models/JumpGame.model
+++ b/AlgebraicDataflowArchitectureModel/models/JumpGame.model
@@ -13,59 +13,59 @@
 	gameover := false
 }
 channel CIO {
-    out force(f:Pair, gravity(y:Double)) == pair(0.0, y)
-    out time(t:Double, gravity(y)) == t + 0.01
+    out force(f:Pair, gravity(y:Double)) = pair(0.0, y)
+    out time(t:Double, gravity(y)) = t + 0.01
 }
 channel CIO2 {
-    out movex(x:Double, run(x2:Double)) == x2
+    out movex(x:Double, run(x2:Double)) = x2
 }
 channel CIO3 {
-    out movey(y:Double, jump(y2:Double)) == y2 
+    out movey(y:Double, jump(y2:Double)) = y2 
 }
 channel CIO4 {
-    out mass(m:Double, setMass(x:Double)) == x
+    out mass(m:Double, setMass(x:Double)) = x
 }
 channel CIO5 {
-    out ground(g:Bool, openHole) == false
-    out ground(g, closeHole) == true
+    out ground(g:Bool, openHole) = false
+    out ground(g, closeHole) = true
 }
 channel C1 {
     ref onground(o, update1(f2, m2, o))
-    in force(f, update1(f2, m2, o)) == f2
-    in mass(m, update1(f2, m2, o)) == m2
-    out acceleration(a:Pair, update1(f2, m2, o)) == if(o, pair(left(f2) / m2, 0.0), pair(left(f2) / m2, right(f2) / m2))
+    in force(f, update1(f2, m2, o)) = f2
+    in mass(m, update1(f2, m2, o)) = m2
+    out acceleration(a:Pair, update1(f2, m2, o)) = if(o, pair(left(f2) / m2, 0.0), pair(left(f2) / m2, right(f2) / m2))
 }
 channel C2 {
     ref onground(o, update3(a2, o))
-    in acceleration(a, update3(a2, o)) == a2
-    out velocity(v:Pair, update3(a2, o)) == if(and(o, lt(right(v), 0.0)), 
+    in acceleration(a, update3(a2, o)) = a2
+    out velocity(v:Pair, update3(a2, o)) = if(o && right(v) < 0.0, 
                                                     pair(left(v) + 0.01 * left(a2), 0.0), 
                                                     pair(left(v) + 0.01 * left(a2), right(v) + 0.01 * right(a2)))
 }
 channel C3 {
     ref onground(o, update4(x2, o))
-    in movex(x, update4(x2, o)) == x2
-    out velocity(v:Pair, update4(x2, o)) == if(o, pair(x2, right(v)), v)
+    in movex(x, update4(x2, o)) = x2
+    out velocity(v:Pair, update4(x2, o)) = if(o, pair(x2, right(v)), v)
 }
 channel C4 {
     ref onground(o, update5(x2, o))
-    in movey(y, update5(y2, o)) == y2
-    out velocity(v:Pair, update5(y2, o)) == if(o, pair(left(v), y2), v)
+    in movey(y, update5(y2, o)) = y2
+    out velocity(v:Pair, update5(y2, o)) = if(o, pair(left(v), y2), v)
 }
 channel C5 {
-    in velocity(v, update6(v2, g)) == v2
+    in velocity(v, update6(v2, g)) = v2
     ref ground(g, update6(v2, g))
-    out position(p:Pair, update6(v2, g)) == if(and(eq(g, true), lt(right(p) + 0.01 * right(v2), 0.0)), 
+    out position(p:Pair, update6(v2, g)) = if(g == true && right(p) + 0.01 * right(v2) > 0.0, 
                                                     pair(left(p) + 0.01 * left(v2), 0.0), 
                                                     pair(left(p) + 0.01 * left(v2), right(p) + 0.01 * right(v2)))
 }
 channel C6 {
-    in position(p, update2(p2, g2)) == p2
-    in ground(g, update2(p2, g2)) == g2
-    out onground(o:Bool, update2(p2, g2)) == and(eq(g2, true), le(right(p2), 0.0))
+    in position(p, update2(p2, g2)) = p2
+    in ground(g, update2(p2, g2)) = g2
+    out onground(o:Bool, update2(p2, g2)) = (g2 == true && right(p2) <= 0.0)
 }
 channel C7 {
-    in position(p, update7(p2)) == p2
-    out clear(c:Bool, update7(p2)) == if(gt(left(p2), 100.0), true, false)
-    out gameover(go:Bool, update7(p2)) == if(lt(right(p2), -1.0), true, false)
+    in position(p, update7(p2)) = p2
+    out clear(c:Bool, update7(p2)) = (left(p2) > 100.0)
+    out gameover(go:Bool, update7(p2)) = (right(p2) < -1.0)
 }
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/models/Kinematics.model b/AlgebraicDataflowArchitectureModel/models/Kinematics.model
new file mode 100644
index 0000000..3d10af4
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/models/Kinematics.model
@@ -0,0 +1,20 @@
+channel CIO {
+	out force(f:Double, action(x)) = x
+	out time(t:Double, action(x)) = t + 0.01
+}
+
+channel C1 {
+	in force(f, update1(y, m)) = y
+	in mass(m, update1(y, m)) = m
+	out acceleration(a:Double, update1(y, m)) = y / m
+}
+
+channel C2 {
+	in acceleration(a, update2(z)) = z
+	out velocity(v:Double, update2(z)) = v + 0.01 * z
+}
+
+channel C3 {
+	in velocity(v, update3(u)) = u
+	out position(p:Double, update3(u)) = p + 0.01 * u
+}
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/models/Kinetics.model b/AlgebraicDataflowArchitectureModel/models/Kinetics.model
deleted file mode 100644
index 5218206..0000000
--- a/AlgebraicDataflowArchitectureModel/models/Kinetics.model
+++ /dev/null
@@ -1,20 +0,0 @@
-channel CIO {
-	out force(f:Double, action(x)) == x
-	out time(t:Double, action(x)) == t + 0.01
-}
-
-channel C1 {
-	in force(f, update1(y, m)) == y
-	in mass(m, update1(y, m)) == m
-	out acceleration(a:Double, update1(y, m)) == y / m
-}
-
-channel C2 {
-	in acceleration(a, update2(z)) == z
-	out velocity(v:Double, update2(z)) == v + 0.01 * z
-}
-
-channel C3 {
-	in velocity(v, update3(u)) == u
-	out position(p:Double, update3(u)) == p + 0.01 * u
-}
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/models/Map.dtram b/AlgebraicDataflowArchitectureModel/models/Map.dtram
index b1fe577..6dab88a 100644
--- a/AlgebraicDataflowArchitectureModel/models/Map.dtram
+++ b/AlgebraicDataflowArchitectureModel/models/Map.dtram
@@ -1,15 +1,15 @@
 model {
 	channel GPS_In {
-		out longitude(prev_long: Double, updateGPS(cur_long, cur_lat)) == cur_long
-		out latitude(prev_lat: Double, updateGPS(cur_long, cur_lat)) == cur_lat
+		out longitude(prev_long: Double, updateGPS(cur_long, cur_lat)) = cur_long
+		out latitude(prev_lat: Double, updateGPS(cur_long, cur_lat)) = cur_lat
 	}
 	channel LongUpdate {
-		in longitude(prev_long, updateLong(cur_long)) == cur_long
-		out mapLongitude(prev_mapLong, updateLong(cur_long)) == cur_long
+		in longitude(prev_long, updateLong(cur_long)) = cur_long
+		out mapLongitude(prev_mapLong, updateLong(cur_long)) = cur_long
 	}
 	channel LatUpdate {
-		in latitude(prev_lat, updateLat(cur_lat)) == cur_lat
-		out mapLatitude(prev_mapLat, updateLat(cur_lat)) == cur_lat
+		in latitude(prev_lat, updateLat(cur_lat)) = cur_lat
+		out mapLatitude(prev_mapLat, updateLat(cur_lat)) = cur_lat
 	}
 }
 geometry {
diff --git a/AlgebraicDataflowArchitectureModel/models/Map.model b/AlgebraicDataflowArchitectureModel/models/Map.model
index 2ea85ff..bd49d0c 100644
--- a/AlgebraicDataflowArchitectureModel/models/Map.model
+++ b/AlgebraicDataflowArchitectureModel/models/Map.model
@@ -1,14 +1,14 @@
 channel GPS_In {
-	out longitude(prev_long: Double, updateGPS(cur_long, cur_lat)) == cur_long
-	out latitude(prev_lat: Double, updateGPS(cur_long, cur_lat)) == cur_lat
+	out longitude(prev_long: Double, updateGPS(cur_long, cur_lat)) = cur_long
+	out latitude(prev_lat: Double, updateGPS(cur_long, cur_lat)) = cur_lat
 }
 
 channel LongUpdate {
-	in longitude(prev_long, updateLong(cur_long)) == cur_long
-	out mapLongitude(prev_mapLong, updateLong(cur_long)) == cur_long
+	in longitude(prev_long, updateLong(cur_long)) = cur_long
+	out mapLongitude(prev_mapLong, updateLong(cur_long)) = cur_long
 }
 
 channel LatUpdate {
-	in latitude(prev_lat, updateLat(cur_lat)) == cur_lat
-	out mapLatitude(prev_mapLat, updateLat(cur_lat)) == cur_lat
+	in latitude(prev_lat, updateLat(cur_lat)) = cur_lat
+	out mapLatitude(prev_mapLat, updateLat(cur_lat)) = cur_lat
 }
diff --git a/AlgebraicDataflowArchitectureModel/models/POS.dtram b/AlgebraicDataflowArchitectureModel/models/POS.dtram
index dc3d2d1..d1cb11c 100644
--- a/AlgebraicDataflowArchitectureModel/models/POS.dtram
+++ b/AlgebraicDataflowArchitectureModel/models/POS.dtram
@@ -1,18 +1,18 @@
 model {
 channel CIO {
-	out payment(p:Int, purchase(x:Int)) == x
+	out payment(p:Int, purchase(x:Int)) = x
 }
 channel C3 {
-	in history(h, update3(u)) == u
-	out total(t:Int, update3(u)) == sum(u)
+	in history(h, update3(u)) = u
+	out total(t:Int, update3(u)) = sum(u)
 }
 channel C1 {
-	in payment(p, update1(y)) == y
-	out points(l:Int, update1(y)) == floor(y * 0.05)
+	in payment(p, update1(y)) = y
+	out points(l:Int, update1(y)) = floor(y * 0.05)
 }
 channel C2 {
-	in payment(p, update2(z)) == z
-	out history(h:List, update2(z)) == cons(z, h)
+	in payment(p, update2(z)) = z
+	out history(h:List, update2(z)) = cons(z, h)
 }
 }
 geometry {
diff --git a/AlgebraicDataflowArchitectureModel/models/POS.model b/AlgebraicDataflowArchitectureModel/models/POS.model
index 150c106..c15c931 100644
--- a/AlgebraicDataflowArchitectureModel/models/POS.model
+++ b/AlgebraicDataflowArchitectureModel/models/POS.model
@@ -1,15 +1,15 @@
 channel CIO {
-	out payment(p:Int, purchase(x:Int)) == x
+	out payment(p:Int, purchase(x:Int)) = x
 }
 channel C3 {
-	in history(h, update3(u)) == u
-	out total(t:Int, update3(u)) == sum(u)
+	in history(h, update3(u)) = u
+	out total(t:Int, update3(u)) = sum(u)
 }
 channel C1 {
-	in payment(p, update1(y)) == y
-	out points(l:Int, update1(y)) == floor(y * 0.05)
+	in payment(p, update1(y)) = y
+	out points(l:Int, update1(y)) = floor(y * 0.05)
 }
 channel C2 {
-	in payment(p, update2(z)) == z
-	out history(h:List, update2(z)) == cons(z, h)
+	in payment(p, update2(z)) = z
+	out history(h:List, update2(z)) = cons(z, h)
 }
diff --git a/AlgebraicDataflowArchitectureModel/models/POS2.model b/AlgebraicDataflowArchitectureModel/models/POS2.model
index 6ae676d..0ee31d2 100644
--- a/AlgebraicDataflowArchitectureModel/models/POS2.model
+++ b/AlgebraicDataflowArchitectureModel/models/POS2.model
@@ -1,14 +1,14 @@
 channel CIO {
-	out payment(p:Int, purchase(x:Int)) == x
+	out payment(p:Int, purchase(x:Int)) = x
 }
 
 channel C1 {
-	in payment(p1, update1(y)) == y
-	out points(l:Int, update1(y)) == floor(y * 0.05)
+	in payment(p1, update1(y)) = y
+	out points(l:Int, update1(y)) = floor(y * 0.05)
 }
 
 channel C2 {
-	in payment(p1, update2(z)) == z
-	out history(h:List, update2(z)) == cons(z, h)
-	out total(t:Int, update2(z)) == z + t
+	in payment(p1, update2(z)) = z
+	out history(h:List, update2(z)) = cons(z, h)
+	out total(t:Int, update2(z)) = z + t
 }
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/models/SSDStore.dtram b/AlgebraicDataflowArchitectureModel/models/SSDStore.dtram
index e226ec0..acc0c77 100644
--- a/AlgebraicDataflowArchitectureModel/models/SSDStore.dtram
+++ b/AlgebraicDataflowArchitectureModel/models/SSDStore.dtram
@@ -1,22 +1,22 @@
 model {
 	channel capacity_In {
-		out capacity(prev_capacity:Int, setCapacity(cur_capacity)) == cur_capacity
+		out capacity(prev_capacity:Int, setCapacity(cur_capacity)) = cur_capacity
 	}
 	channel price_In {
-		out price(prev_price:Int, setPrice(cur_price)) == cur_price
+		out price(prev_price:Int, setPrice(cur_price)) = cur_price
 	}
 	channel siteA_Add {
-		out siteA(prev_products:List, addProductToSiteA(price:Int, capacity:Int)) == cons({"price": price, "capacity": capacity}, prev_products)
+		out siteA(prev_products:List, addProductToSiteA(price:Int, capacity:Int)) = cons({"price": price, "capacity": capacity}, prev_products)
 	}
 	channel capacity_Update {
-		in siteA(prev_products:List, updateList(cur_products, cur_capacity)) == cur_products
-		in capacity(prev_capacity:Int, updateList(cur_products, cur_capacity)) == cur_capacity
-		out itemsByCapacity(prev_items:List, updateList(cur_products, cur_capacity)) == selectGE(cur_products, "capacity", cur_capacity)
+		in siteA(prev_products:List, updateList(cur_products, cur_capacity)) = cur_products
+		in capacity(prev_capacity:Int, updateList(cur_products, cur_capacity)) = cur_capacity
+		out itemsByCapacity(prev_items:List, updateList(cur_products, cur_capacity)) = selectGE(cur_products, "capacity", cur_capacity)
 	}
 	channel price_Update {
-		in siteA(prev_products:List, updateList(cur_products, cur_price)) == cur_products
-		in price(prev_price:Int, updateList(cur_products, cur_price)) == cur_price
-		out itemsByPrice(prev_items:List, updateList(cur_products, cur_price)) == selectLE(cur_products, "price", cur_price)
+		in siteA(prev_products:List, updateList(cur_products, cur_price)) = cur_products
+		in price(prev_price:Int, updateList(cur_products, cur_price)) = cur_price
+		out itemsByPrice(prev_items:List, updateList(cur_products, cur_price)) = selectLE(cur_products, "price", cur_price)
 	}
 }
 geometry {
diff --git a/AlgebraicDataflowArchitectureModel/models/SSDStore.model b/AlgebraicDataflowArchitectureModel/models/SSDStore.model
index e8696fe..6331ddb 100644
--- a/AlgebraicDataflowArchitectureModel/models/SSDStore.model
+++ b/AlgebraicDataflowArchitectureModel/models/SSDStore.model
@@ -1,23 +1,23 @@
 channel capacity_In {
-	out capacity(prev_capacity:Int, setCapacity(cur_capacity)) == cur_capacity
+	out capacity(prev_capacity:Int, setCapacity(cur_capacity)) = cur_capacity
 }
 
 channel price_In {
-	out price(prev_price:Int, setPrice(cur_price)) == cur_price
+	out price(prev_price:Int, setPrice(cur_price)) = cur_price
 }
 
 channel siteA_Add {
-	out siteA(prev_products:List, addProductToSiteA(price:Int, capacity:Int)) == cons({"price": price, "capacity": capacity}, prev_products)
+	out siteA(prev_products:List, addProductToSiteA(price:Int, capacity:Int)) = cons({"price": price, "capacity": capacity}, prev_products)
 }
 
 channel capacity_Update {
-	in siteA(prev_products:List, updateList(cur_products, cur_capacity)) == cur_products
-	in capacity(prev_capacity:Int, updateList(cur_products, cur_capacity)) == cur_capacity
-	out itemsByCapacity(prev_items:List, updateList(cur_products, cur_capacity)) == selectGE(cur_products, "capacity", cur_capacity)
+	in siteA(prev_products:List, updateList(cur_products, cur_capacity)) = cur_products
+	in capacity(prev_capacity:Int, updateList(cur_products, cur_capacity)) = cur_capacity
+	out itemsByCapacity(prev_items:List, updateList(cur_products, cur_capacity)) = selectGE(cur_products, "capacity", cur_capacity)
 }
 
 channel price_Update {
-	in siteA(prev_products:List, updateList(cur_products, cur_price)) == cur_products
-	in price(prev_price:Int, updateList(cur_products, cur_price)) == cur_price
-	out itemsByPrice(prev_items:List, updateList(cur_products, cur_price)) == selectLE(cur_products, "price", cur_price)
+	in siteA(prev_products:List, updateList(cur_products, cur_price)) = cur_products
+	in price(prev_price:Int, updateList(cur_products, cur_price)) = cur_price
+	out itemsByPrice(prev_items:List, updateList(cur_products, cur_price)) = selectLE(cur_products, "price", cur_price)
 }
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/models/SamplePULL.dtram b/AlgebraicDataflowArchitectureModel/models/SamplePULL.dtram
index 0c06ae8..8d0349f 100644
--- a/AlgebraicDataflowArchitectureModel/models/SamplePULL.dtram
+++ b/AlgebraicDataflowArchitectureModel/models/SamplePULL.dtram
@@ -1,14 +1,14 @@
 model {
 	channel setAChannel {
-		 out a(aValue:Int, setA(value)) == value
+		 out a(aValue:Int, setA(value)) = value
 	}
 	channel outBChannel {
-		 in  a(aValue:Int, calcB(aValue)) == aValue
-	 	 out b(bValue:Int ,calcB(aValue)) == aValue * 2
+		 in  a(aValue:Int, calcB(aValue)) = aValue
+	 	 out b(bValue:Int ,calcB(aValue)) = aValue * 2
 	}
 	channel outCChannel {
-		 in  a(aValue:Int, calcC(aValue)) == aValue
-		 out c(cValue:Int, calcC(aValue)) == aValue + 1
+		 in  a(aValue:Int, calcC(aValue)) = aValue
+		 out c(cValue:Int, calcC(aValue)) = aValue + 1
 	}
 }
 geometry {
diff --git a/AlgebraicDataflowArchitectureModel/models/SamplePUSH.dtram b/AlgebraicDataflowArchitectureModel/models/SamplePUSH.dtram
index c07e68b..1b9a704 100644
--- a/AlgebraicDataflowArchitectureModel/models/SamplePUSH.dtram
+++ b/AlgebraicDataflowArchitectureModel/models/SamplePUSH.dtram
@@ -1,10 +1,10 @@
 model {
 	channel setAChannel {
-		 out a(aValue:Int, setA(value)) == value
+		 out a(aValue:Int, setA(value)) = value
 	}
 	channel updateBChannel {
-		 in a(aValue:Int, updateB(aValue)) == aValue
-		 out b(bValue:Int, updateB(aValue)) == bValue + aValue
+		 in a(aValue:Int, updateB(aValue)) = aValue
+		 out b(bValue:Int, updateB(aValue)) = bValue + aValue
 	}
 }
 geometry {
diff --git a/AlgebraicDataflowArchitectureModel/models/StockManagement.model b/AlgebraicDataflowArchitectureModel/models/StockManagement.model
index b133f44..4528cb7 100644
--- a/AlgebraicDataflowArchitectureModel/models/StockManagement.model
+++ b/AlgebraicDataflowArchitectureModel/models/StockManagement.model
@@ -4,47 +4,47 @@
 }
 
 channel CIO_enter {
-	out arrival(s:Tuple, arrive(item:Str, num:Int)) == tuple(item, num)
+	out arrival(s:Tuple, arrive(item:Str, num:Int)) = tuple(item, num)
 }
 
 channel CIO_req {
-	out request(r:Tuple, req(item:Str, num:Int)) == tuple(item, num)
+	out request(r:Tuple, req(item:Str, num:Int)) = tuple(item, num)
 }
 
 channel C1 {
-	in arrival(ar, update1(ar2, st)) == ar2
+	in arrival(ar, update1(ar2, st)) = ar2
 	ref stock(st:Map, update1(ar2, st))
-	out available(av:Tuple, update1(ar2, st)) == tuple(fst(ar2), snd(ar2) + lookup(st, fst(ar2)))
+	out available(av:Tuple, update1(ar2, st)) = tuple(fst(ar2), snd(ar2) + lookup(st, fst(ar2)))
 }
 
 channel C2 {
-	in available(av, update2(av2, sh)) == av2
+	in available(av, update2(av2, sh)) = av2
 	ref shortage(sh, update2(av2, sh))
-	out deriver(dr:Tuple, update2(av2, sh)) == if(ge(snd(av2), lookup(sh, fst(av2))), 
+	out deriver(dr:Tuple, update2(av2, sh)) = if(snd(av2) >= lookup(sh, fst(av2)), 
 												tuple(fst(av2), lookup(sh, fst(av2)), snd(av2) - lookup(sh, fst(av2))), 
 												tuple(fst(av2), 0, snd(av2)))
-	out shortage(s, update2(av2, sh)) == if(ge(snd(av2), lookup(s, fst(av2))), 
+	out shortage(s, update2(av2, sh)) = if(snd(av2) >= lookup(s, fst(av2)), 
 												insert(s, fst(av2), 0), 
 												s)
 }
 
 channel C3 {
-	in deriver(dr, update3(dr2)) == dr2
-	out stock(st, update3(dr2)) == insert(st, fst(dr2), snd(snd(dr2)))
+	in deriver(dr, update3(dr2)) = dr2
+	out stock(st, update3(dr2)) = insert(st, fst(dr2), snd(snd(dr2)))
 }
 
 channel C4 {
-	in deriver(dr, update4(dr2)) == dr2
-	out shipping(sp:Tuple, update4(dr2)) == tuple(fst(dr2), fst(snd(dr2)))
+	in deriver(dr, update4(dr2)) = dr2
+	out shipping(sp:Tuple, update4(dr2)) = tuple(fst(dr2), fst(snd(dr2)))
 }
 
 channel C5 {
-	in request(rq, update5(rq2, st)) == rq2
+	in request(rq, update5(rq2, st)) = rq2
 	ref stock(st, update5(rq2, st))
-	out deriver(dr, update5(rq2, st)) == if(ge(lookup(st, fst(rq2)), snd(rq2)), 
+	out deriver(dr, update5(rq2, st)) = if(lookup(st, fst(rq2)) >= snd(rq2), 
 												tuple(fst(rq2), snd(rq2), lookup(st, fst(rq2)) - snd(rq2)), 
 												tuple(fst(rq2), 0, lookup(st, fst(rq2))))
-	out shortage(sh, update5(rq2, st)) == if(ge(lookup(st, fst(rq2)), snd(rq2)), 
+	out shortage(sh, update5(rq2, st)) = if(lookup(st, fst(rq2)) >= snd(rq2), 
 												sh, 
 												insert(sh, fst(rq2), lookup(sh, fst(rq2)) + snd(rq2)))
 }
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/models/TravelDistance.model b/AlgebraicDataflowArchitectureModel/models/TravelDistance.model
index a0c8fe2..07d12db 100644
--- a/AlgebraicDataflowArchitectureModel/models/TravelDistance.model
+++ b/AlgebraicDataflowArchitectureModel/models/TravelDistance.model
@@ -1,13 +1,13 @@
 channel CX {
-	out pos_x(prev_x: Double, setX(cur_x: Double)) == cur_x
+	out pos_x(prev_x: Double, setX(cur_x: Double)) = cur_x
 }
 
 channel CY {
-	out pos_y(prev_y: Double, setY(cur_y: Double)) == cur_y
+	out pos_y(prev_y: Double, setY(cur_y: Double)) = cur_y
 }
 
 channel C {
-	in pos_x(prev_x, move(dx, dy)) == prev_x + dx
-	in pos_y(prev_y, move(dx, dy)) == prev_y + dy
-	out dist(prev_d, move(dx, dy)) == prev_d + sqrt(dx * dx + dy * dy)
+	in pos_x(prev_x, move(dx, dy)) = prev_x + dx
+	in pos_y(prev_y, move(dx, dy)) = prev_y + dy
+	out dist(prev_d, move(dx, dy)) = prev_d + sqrt(dx * dx + dy * dy)
 }
diff --git a/AlgebraicDataflowArchitectureModel/models/Triangle.model b/AlgebraicDataflowArchitectureModel/models/Triangle.model
index ebfe6b4..cf3d0e0 100644
--- a/AlgebraicDataflowArchitectureModel/models/Triangle.model
+++ b/AlgebraicDataflowArchitectureModel/models/Triangle.model
@@ -1,13 +1,13 @@
 channel cio1 {
-	out base(x: Double, setBase(x2)) == x2
+	out base(x: Double, setBase(x2)) = x2
 }
 
 channel cio2 {
-	out height(y: Double, setHeight(y2)) == y2
+	out height(y: Double, setHeight(y2)) = y2
 }
 
 channel triangle {
-	in base(x, update(x2, y2)) == x2
-	in height(y, update(x2, y2)) == y2
-	out hypothenuse(z: Double, update(x2, y2)) == sqrt(x2 * x2 + y2 * y2)
+	in base(x, update(x2, y2)) = x2
+	in height(y, update(x2, y2)) = y2
+	out hypothenuse(z: Double, update(x2, y2)) = sqrt(x2 * x2 + y2 * y2)
 }
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/models/Triangle2.model b/AlgebraicDataflowArchitectureModel/models/Triangle2.model
index db775bd..bfd9409 100644
--- a/AlgebraicDataflowArchitectureModel/models/Triangle2.model
+++ b/AlgebraicDataflowArchitectureModel/models/Triangle2.model
@@ -1,13 +1,13 @@
 channel cio1 {
-	out base(x: Double, setBase(x2)) == x2
+	out base(x: Double, setBase(x2)) = x2
 }
 
 channel cio2 {
-	out height(y: Double, setHeight(y2)) == y2
+	out height(y: Double, setHeight(y2)) = y2
 }
 
 channel triangle {
-	in base(x, update: Tuple) == fst(update)
-	in height(y, update) == snd(update)
-	out hypothenuse(z: Double, update) == sqrt(fst(update) * fst(update) + snd(update) * snd(update))
+	in base(x, update: Tuple) = fst(update)
+	in height(y, update) = snd(update)
+	out hypothenuse(z: Double, update) = sqrt(fst(update) * fst(update) + snd(update) * snd(update))
 }
\ No newline at end of file
diff --git a/AlgebraicDataflowArchitectureModel/models/Twitter.model b/AlgebraicDataflowArchitectureModel/models/Twitter.model
index 57de3b3..b5c0ee5 100644
--- a/AlgebraicDataflowArchitectureModel/models/Twitter.model
+++ b/AlgebraicDataflowArchitectureModel/models/Twitter.model
@@ -1,47 +1,47 @@
 channel a_Tweet {
-	out a_tweets(l:List, a_tweet(t:Str, time:Long)) == cons(tuple(time, t), l)
+	out a_tweets(l:List, a_tweet(t:Str, time:Long)) = cons(tuple(time, t), l)
 }
 
 channel a_Follow {
-	out a_following(f:List, a_follow(u:Int)) == cons(u, f)
+	out a_following(f:List, a_follow(u:Int)) = cons(u, f)
 }
 
 channel a_Home {
-	in a_tweets(la1, update_a(f2, la2, lb2, lc2)) == la2
-	in b_tweets(lb1, update_a(f2, la2, lb2, lc2)) == lb2
-	in c_tweets(lc1, update_a(f2, la2, lb2, lc2)) == lc2
-	in a_following(f, update_a(f2, la2, lb2, lc2)) == f2
-	out a_timeline(t:List, update_a(f2, la2, lb2, lc2)) == merge(la2, if(contains(f2,2), merge(lb2, if(contains(f2,3), lc2, nil)), if(contains(f2,3), lc2, nil)))
+	in a_tweets(la1, update_a(f2, la2, lb2, lc2)) = la2
+	in b_tweets(lb1, update_a(f2, la2, lb2, lc2)) = lb2
+	in c_tweets(lc1, update_a(f2, la2, lb2, lc2)) = lc2
+	in a_following(f, update_a(f2, la2, lb2, lc2)) = f2
+	out a_timeline(t:List, update_a(f2, la2, lb2, lc2)) = merge(la2, if(contains(f2,2), merge(lb2, if(contains(f2,3), lc2, nil)), if(contains(f2,3), lc2, nil)))
 }
 
 channel b_Tweet {
-	out b_tweets(l:List, b_tweet(t:Str, time:Long)) == cons(tuple(time, t), l)
+	out b_tweets(l:List, b_tweet(t:Str, time:Long)) = cons(tuple(time, t), l)
 }
 
 channel b_Follow {
-	out b_following(f:List, b_follow(u:Int)) == cons(u, f)
+	out b_following(f:List, b_follow(u:Int)) = cons(u, f)
 }
 
 channel b_Home {
-	in a_tweets(la1, update_b(f2, la2, lb2, lc2)) == la2
-	in b_tweets(lb1, update_b(f2, la2, lb2, lc2)) == lb2
-	in c_tweets(lc1, update_b(f2, la2, lb2, lc2)) == lc2
-	in b_following(f, update_b(f2, la2, lb2, lc2)) == f2
-	out b_timeline(t:List, update_b(f2, la2, lb2, lc2)) == merge(lb2, if(contains(f2,1), merge(la2, if(contains(f2,3), lc2, nil)), if(contains(f2,3), lc2, nil)))
+	in a_tweets(la1, update_b(f2, la2, lb2, lc2)) = la2
+	in b_tweets(lb1, update_b(f2, la2, lb2, lc2)) = lb2
+	in c_tweets(lc1, update_b(f2, la2, lb2, lc2)) = lc2
+	in b_following(f, update_b(f2, la2, lb2, lc2)) = f2
+	out b_timeline(t:List, update_b(f2, la2, lb2, lc2)) = merge(lb2, if(contains(f2,1), merge(la2, if(contains(f2,3), lc2, nil)), if(contains(f2,3), lc2, nil)))
 }
 
 channel c_Tweet {
-	out c_tweets(l:List, c_tweet(t:Str, time:Long)) == cons(tuple(time, t), l)
+	out c_tweets(l:List, c_tweet(t:Str, time:Long)) = cons(tuple(time, t), l)
 }
 
 channel c_Follow {
-	out c_following(f:List, c_follow(u:Int)) == cons(u, f)
+	out c_following(f:List, c_follow(u:Int)) = cons(u, f)
 }
 
 channel c_Home {
-	in a_tweets(la1, update_c(f2, la2, lb2, lc2)) == la2
-	in b_tweets(lb1, update_c(f2, la2, lb2, lc2)) == lb2
-	in c_tweets(lc1, update_c(f2, la2, lb2, lc2)) == lc2
-	in c_following(f, update_c(f2, la2, lb2, lc2)) == f2
-	out c_timeline(t:List, update_c(f2, la2, lb2, lc2)) == merge(lc2, if(contains(f2,1), merge(la2, if(contains(f2,2), lb2, nil)), if(contains(f2,2), lb2, nil)))
+	in a_tweets(la1, update_c(f2, la2, lb2, lc2)) = la2
+	in b_tweets(lb1, update_c(f2, la2, lb2, lc2)) = lb2
+	in c_tweets(lc1, update_c(f2, la2, lb2, lc2)) = lc2
+	in c_following(f, update_c(f2, la2, lb2, lc2)) = f2
+	out c_timeline(t:List, update_c(f2, la2, lb2, lc2)) = merge(lc2, if(contains(f2,1), merge(la2, if(contains(f2,2), lb2, nil)), if(contains(f2,2), lb2, nil)))
 }
diff --git a/AlgebraicDataflowArchitectureModel/models/WOS.dtram b/AlgebraicDataflowArchitectureModel/models/WOS.dtram
index 45f640c..81b0779 100644
--- a/AlgebraicDataflowArchitectureModel/models/WOS.dtram
+++ b/AlgebraicDataflowArchitectureModel/models/WOS.dtram
@@ -1,17 +1,17 @@
 model {
 channel CIO2 {
-	out highest(h:Double, reset(v)) == v
+	out highest(h:Double, reset(v)) = v
 }
 channel CIO1 {
-	out temp_f(p:Double, observe(x)) == x
+	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
+	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)
+	in temp_f(q:Double, update(y)) = y
+	out highest(h:Double, update(z)) = if(z >= h, z, h)
 }
 }
 geometry {
diff --git a/AlgebraicDataflowArchitectureModel/models/WeatherObservationSystem.model b/AlgebraicDataflowArchitectureModel/models/WeatherObservationSystem.model
index 2cd84d7..0096407 100644
--- a/AlgebraicDataflowArchitectureModel/models/WeatherObservationSystem.model
+++ b/AlgebraicDataflowArchitectureModel/models/WeatherObservationSystem.model
@@ -1,14 +1,14 @@
 channel CIO2 {
-	out highest(h:Double, reset(v)) == v
+	out highest(h:Double, reset(v)) = v
 }
 channel CIO1 {
-	out temp_f(p:Double, observe(x)) == x
+	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
+	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)
+	in temp_f(q:Double, update(y)) = y
+	out highest(h:Double, update(z)) = if(z >= h, z, h)
 }
diff --git a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/ChannelMember.java b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/ChannelMember.java
index 4e99cfb..42f85b2 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/ChannelMember.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/ChannelMember.java
@@ -54,6 +54,6 @@
 		return resourcePath.getResourceName() + "("
 					+ stateTransition.getCurStateExpression() + ","
 					+ stateTransition.getMessageExpression() + ")"
-					+ " == " + stateTransition.getNextStateExpression();
+					+ " = " + stateTransition.getNextStateExpression();
 	}
 }
diff --git a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
index e6b2936..f874089 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
@@ -39,6 +39,16 @@
 	public static final Symbol sub = new Symbol(Parser.SUB, 2, Symbol.Type.INFIX);
 	public static final Symbol div = new Symbol(Parser.DIV, 2, Symbol.Type.INFIX);
 	public static final Symbol minus = new Symbol(Parser.MINUS, 1);
+	public static final Symbol mod = new Symbol(Parser.MOD, 2, Symbol.Type.INFIX, "%", Symbol.Type.INFIX);
+	public static final Symbol eq = new Symbol(Parser.EQ, 2, Symbol.Type.INFIX, "==", Symbol.Type.INFIX);
+	public static final Symbol neq = new Symbol(Parser.NEQ, 2, Symbol.Type.INFIX, "!=", Symbol.Type.INFIX);
+	public static final Symbol gt = new Symbol(Parser.GT, 2, Symbol.Type.INFIX, ">", Symbol.Type.INFIX);
+	public static final Symbol lt = new Symbol(Parser.LT, 2, Symbol.Type.INFIX, "<", Symbol.Type.INFIX);
+	public static final Symbol ge = new Symbol(Parser.GE, 2, Symbol.Type.INFIX, ">=", Symbol.Type.INFIX);
+	public static final Symbol le = new Symbol(Parser.LE, 2, Symbol.Type.INFIX, "<=", Symbol.Type.INFIX);
+	public static final Symbol and = new Symbol(Parser.AND, 2, Symbol.Type.INFIX, "&&", Symbol.Type.INFIX);
+	public static final Symbol or = new Symbol(Parser.OR, 2, Symbol.Type.INFIX, "||", Symbol.Type.INFIX);
+	public static final Symbol neg = new Symbol(Parser.NEG, 1, Symbol.Type.INFIX, "!", Symbol.Type.PREFIX);
 	public static final Symbol cons = new Symbol("cons", 2, Symbol.Type.PREFIX, "($x,$y)->$x.add(0, $y)", Symbol.Type.LAMBDA_WITH_SIDE_EFFECT, new int[] {1, 0});
 	public static final Symbol append = new Symbol("append", 2, Symbol.Type.PREFIX, "add", Symbol.Type.METHOD_WITH_SIDE_EFFECT);
 	public static final Symbol remove = new Symbol("remove", 2, Symbol.Type.PREFIX, "remove", Symbol.Type.METHOD_WITH_SIDE_EFFECT);
@@ -80,6 +90,8 @@
 		}
 	});
 	public static final Symbol null_ = new Symbol("null", 0, Symbol.Type.PREFIX, "null", Symbol.Type.PREFIX);
+	public static final Symbol true_ = new Symbol("true", 0, Symbol.Type.PREFIX, "true", Symbol.Type.PREFIX);
+	public static final Symbol false_ = new Symbol("false", 0, Symbol.Type.PREFIX, "false", Symbol.Type.PREFIX);
 	public static final Symbol cond = new Symbol("if", 3, Symbol.Type.PREFIX, new Symbol.IImplGenerator() {
 		final int count[] = {0};
 		@Override
@@ -105,18 +117,6 @@
 	});
 	
 	
-	public static final Symbol mod = new Symbol("mod", 2, Symbol.Type.PREFIX, "%", Symbol.Type.INFIX);
-	public static final Symbol eq = new Symbol("eq", 2, Symbol.Type.PREFIX, "==", Symbol.Type.INFIX);
-	public static final Symbol neq = new Symbol("neq", 2, Symbol.Type.PREFIX, "!=", Symbol.Type.INFIX);
-	public static final Symbol gt = new Symbol("gt", 2, Symbol.Type.PREFIX, ">", Symbol.Type.INFIX);
-	public static final Symbol lt = new Symbol("lt", 2, Symbol.Type.PREFIX, "<", Symbol.Type.INFIX);
-	public static final Symbol ge = new Symbol("ge", 2, Symbol.Type.PREFIX, ">=", Symbol.Type.INFIX);
-	public static final Symbol le = new Symbol("le", 2, Symbol.Type.PREFIX, "<=", Symbol.Type.INFIX);
-	public static final Symbol and = new Symbol("and", 2, Symbol.Type.PREFIX, "&&", Symbol.Type.INFIX);
-	public static final Symbol or = new Symbol("or", 2, Symbol.Type.PREFIX, "||", Symbol.Type.INFIX);
-	public static final Symbol neg = new Symbol("neg", 1, Symbol.Type.PREFIX, "!", Symbol.Type.PREFIX);
-	public static final Symbol true_ = new Symbol("true", 0, Symbol.Type.PREFIX, "true", Symbol.Type.PREFIX);
-	public static final Symbol false_ = new Symbol("false", 0, Symbol.Type.PREFIX, "false", Symbol.Type.PREFIX);
 	public static final Symbol pair = new Symbol("pair", -1, Symbol.Type.PREFIX, new Symbol.IImplGenerator() {
 		@Override
 		public String generate(Type type, Type[] childrenTypes, String[] childrenImpl, String[] childrenSideEffects, String[] sideEffect) {
@@ -188,6 +188,15 @@
 		div.setInverses(new Symbol[] {mul});
 		minus.setInverses(new Symbol[] {minus});
 		mod.setSignature(new Type[] {typeInt, null, null});
+		eq.setSignature(new Type[] {typeBoolean, null, null});
+		neq.setSignature(new Type[] {typeBoolean, null, null});
+		gt.setSignature(new Type[] {typeBoolean, null, null});
+		lt.setSignature(new Type[] {typeBoolean, null, null});
+		ge.setSignature(new Type[] {typeBoolean, null, null});
+		le.setSignature(new Type[] {typeBoolean, null, null});
+		and.setSignature(new Type[] {typeBoolean, typeBoolean, typeBoolean});
+		or.setSignature(new Type[] {typeBoolean, typeBoolean, typeBoolean});
+		neg.setSignature(new Type[] {typeBoolean, typeBoolean});
 		cons.setInverses(new Symbol[] {head, tail});
 		cons.setSignature(new Type[] {typeList, null, typeList});
 		append.setSignature(new Type[] {typeList, typeList, null});
@@ -198,18 +207,9 @@
 		length.setSignature(new Type[] {typeInt, null});
 		get.setSignature(new Type[] {null, typeList, typeInt});
 		set.setSignature(new Type[] {typeList, typeList, typeInt, null});
-		eq.setSignature(new Type[] {typeBoolean, null, null});
-		neq.setSignature(new Type[] {typeBoolean, null, null});
-		gt.setSignature(new Type[] {typeBoolean, null, null});
-		lt.setSignature(new Type[] {typeBoolean, null, null});
-		ge.setSignature(new Type[] {typeBoolean, null, null});
-		le.setSignature(new Type[] {typeBoolean, null, null});
-		and.setSignature(new Type[] {typeBoolean, typeBoolean, typeBoolean});
-		or.setSignature(new Type[] {typeBoolean, typeBoolean, typeBoolean});
-		neg.setSignature(new Type[] {typeBoolean, typeBoolean});
+		null_.setSignature(new Type[] {null});
 		true_.setSignature(new Type[] {typeBoolean});
 		false_.setSignature(new Type[] {typeBoolean});
-		null_.setSignature(new Type[] {null});
 		pair.setSignature(new Type[] {typePair,null,null});
 		pair.setInverses(new Symbol[] {left, right});
 		left.setSignature(new Type[] {null, typePair});
@@ -269,17 +269,6 @@
 		addSymbol(div);
 		addSymbol(minus);
 		addSymbol(mod);
-		addSymbol(cons);
-		addSymbol(append);
-		addSymbol(remove);
-		addSymbol(head);
-		addSymbol(tail);
-		addSymbol(length);
-		addSymbol(contains);
-		addSymbol(get);
-		addSymbol(set);
-		addSymbol(nil);
-		addSymbol(cond);
 		addSymbol(eq);
 		addSymbol(neq);
 		addSymbol(gt);
@@ -289,9 +278,20 @@
 		addSymbol(and);
 		addSymbol(or);
 		addSymbol(neg);
+		addSymbol(cons);
+		addSymbol(append);
+		addSymbol(remove);
+		addSymbol(head);
+		addSymbol(tail);
+		addSymbol(length);
+		addSymbol(contains);
+		addSymbol(get);
+		addSymbol(set);
+		addSymbol(cond);
+		addSymbol(nil);
+		addSymbol(null_);
 		addSymbol(true_);
 		addSymbol(false_);
-		addSymbol(null_);
 		addSymbol(pair);
 		addSymbol(left);
 		addSymbol(right);
diff --git a/AlgebraicDataflowArchitectureModel/src/models/visualModel/FormulaChannel.java b/AlgebraicDataflowArchitectureModel/src/models/visualModel/FormulaChannel.java
index 581d31e..1e09595 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/visualModel/FormulaChannel.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/visualModel/FormulaChannel.java
@@ -63,8 +63,8 @@
 		super.addChannelMemberAsOutput(channelMember);
 		if (getOutputChannelMembers().size() == 1) {
 			if (formula == null) formula = "";
-			if (!formula.contains("==")) {
-				formula = channelMember.getResource().getResourceName() + " == " + formula;
+			if (!formula.contains("=")) {
+				formula = channelMember.getResource().getResourceName() + " = " + formula;
 			}
 		}
 		if (formulaRhs != null) {
diff --git a/AlgebraicDataflowArchitectureModel/src/parser/Parser.java b/AlgebraicDataflowArchitectureModel/src/parser/Parser.java
index a7c9fb5..0f6be09 100644
--- a/AlgebraicDataflowArchitectureModel/src/parser/Parser.java
+++ b/AlgebraicDataflowArchitectureModel/src/parser/Parser.java
@@ -3,7 +3,6 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import models.algebra.Constant;
@@ -19,7 +18,6 @@
 import models.dataConstraintModel.StateTransition;
 import models.dataFlowModel.DataTransferModel;
 import models.dataFlowModel.DataTransferChannel;
-import parser.Parser.TokenStream;
 import parser.exceptions.ExpectedAssignment;
 import parser.exceptions.ExpectedChannel;
 import parser.exceptions.ExpectedChannelName;
@@ -55,7 +53,17 @@
 	public static final String MUL = "*";
 	public static final String SUB = "-";
 	public static final String DIV = "/";
+	public static final String MOD = "%";
 	public static final String MINUS = "-";
+	public static final String EQ = "==";
+	public static final String NEQ = "!=";
+	public static final String GT = ">";
+	public static final String LT = "<";
+	public static final String GE = ">=";
+	public static final String LE = "<=";
+	public static final String AND = "&&";
+	public static final String OR = "||";
+	public static final String NEG = "!";
 	public static final String ADD_REGX = "\\+";
 	public static final String MUL_REGX = "\\*";
 	public static final String SUB_REGX = "\\-";
@@ -63,7 +71,8 @@
 	public static final String IN = "in";
 	public static final String OUT = "out";
 	public static final String REF = "ref";
-	public static final String EQUALS = "==";
+	public static final String OR_REGX = "\\|\\|";
+	public static final String EQUALS = "=";
 	public static final String ASSIGNMENT = "=";
 	public static final String COMMA = ",";
 	public static final String COLON = ":";
@@ -257,30 +266,33 @@
 		ArrayList<Symbol> operators = new ArrayList<>();
 		String operator = null;
 		for (;;) {
-			String leftBracketOrMinus = stream.next();
-			if (leftBracketOrMinus.equals(LEFT_BRACKET)) {
+			String leftBracketOrMinusOrNeg = stream.next();
+			if (leftBracketOrMinusOrNeg.equals(LEFT_BRACKET)) {
 				Expression exp = parseTerm(stream, model);
 				String rightBracket = stream.next();
 				if (!rightBracket.equals(RIGHT_BRACKET)) throw new ExpectedRightBracket(stream.getLine());
 				expressions.add(exp);
-			} else if (leftBracketOrMinus.equals(LEFT_CURLY_BRACKET)) {
+			} else if (leftBracketOrMinusOrNeg.equals(LEFT_CURLY_BRACKET)) {
 				Expression exp = parseJsonTerm(stream, model);
 				String rightBracket = stream.next();
 				if (!rightBracket.equals(RIGHT_CURLY_BRACKET)) throw new ExpectedRightBracket(stream.getLine());
 				expressions.add(exp);
-			} else if (leftBracketOrMinus.equals(LEFT_SQUARE_BRACKET)) {
+			} else if (leftBracketOrMinusOrNeg.equals(LEFT_SQUARE_BRACKET)) {
 				Expression exp = parseListTerm(stream, model);
 				String rightBracket = stream.next();
 				if (!rightBracket.equals(RIGHT_SQUARE_BRACKET)) throw new ExpectedRightBracket(stream.getLine());
 				expressions.add(exp);
 			} else {
-				Symbol minus = null;
+				Symbol minusOrNeg = null;
 				String symbolName = null;
-				if (leftBracketOrMinus.equals(MINUS)) {
-					minus = DataTransferModel.minus;		// not sub
+				if (leftBracketOrMinusOrNeg.equals(MINUS)) {
+					minusOrNeg = DataTransferModel.minus;		// not sub
+					symbolName = stream.next();
+				} else if (leftBracketOrMinusOrNeg.equals(NEG)) {
+					minusOrNeg = DataTransferModel.neg;
 					symbolName = stream.next();
 				} else {
-					symbolName = leftBracketOrMinus;
+					symbolName = leftBracketOrMinusOrNeg;
 				}
 				Expression exp = null;
 				if (stream.checkNext() != null && stream.checkNext().equals(LEFT_BRACKET)) {
@@ -333,10 +345,10 @@
 						}
 					}
 				}
-				if (minus != null) {
-					Term minusTerm = new Term(minus);
-					minusTerm.addChild(exp);
-					expressions.add(minusTerm);
+				if (minusOrNeg != null) {
+					Term minusOrNegTerm = new Term(minusOrNeg);
+					minusOrNegTerm.addChild(exp);
+					expressions.add(minusOrNegTerm);
 				} else {
 					expressions.add(exp);
 				}
@@ -356,6 +368,36 @@
 			} else if (operator.equals(DIV)) {
 				operators.add(DataTransferModel.div);
 				stream.next();
+			} else if (operator.equals(MOD)) {
+				operators.add(DataTransferModel.mod);
+				stream.next();
+			} else if (operator.equals(EQ)) {
+				operators.add(DataTransferModel.eq);
+				stream.next();
+			} else if (operator.equals(NEQ)) {
+				operators.add(DataTransferModel.neq);
+				stream.next();
+			} else if (operator.equals(GT)) {
+				operators.add(DataTransferModel.gt);
+				stream.next();
+			} else if (operator.equals(LT)) {
+				operators.add(DataTransferModel.lt);
+				stream.next();
+			} else if (operator.equals(GE)) {
+				operators.add(DataTransferModel.ge);
+				stream.next();
+			} else if (operator.equals(LE)) {
+				operators.add(DataTransferModel.le);
+				stream.next();
+			} else if (operator.equals(AND)) {
+				operators.add(DataTransferModel.and);
+				stream.next();
+			} else if (operator.equals(OR)) {
+				operators.add(DataTransferModel.or);
+				stream.next();
+			} else if (operator.equals(NEG)) {
+				operators.add(DataTransferModel.neg);
+				stream.next();
 			} else if (operator.equals(DOT)) {
 				// json accessor
 				Expression exp = expressions.remove(0);
@@ -403,7 +445,9 @@
 		int i = 1;
 		for (Symbol op: operators) {
 			Expression second = expressions.get(i);
-			if (op.getName().equals(MUL) || op.getName().equals(DIV)) {
+			if (op.getName().equals(MUL) || op.getName().equals(DIV) || op.getName().equals(MOD)
+					|| op.getName().equals(EQ) || op.getName().equals(NEQ) || op.getName().equals(GT) || op.getName().equals(LT)
+					|| op.getName().equals(GE) || op.getName().equals(LE) || op.getName().equals(AND) || op.getName().equals(OR)) {
 				Term term = new Term(op);
 				term.addChild(first);
 				term.addChild(second);
@@ -502,7 +546,7 @@
 	 * "TokenStream" has a token what is read from description of "Architecture Language Model".
 	 */
 	public static class TokenStream {
-		private ArrayList<ArrayList<String>> tokens = new ArrayList<>();
+		private ArrayList<ArrayList<Token>> tokens = new ArrayList<>();
 		private ArrayList<String> lines = new ArrayList<>();
 		private int line = 0;
 		private int n = 0;
@@ -530,15 +574,45 @@
 																											splitBy(
 																													splitBy(
 																															splitBy(
-																																	Arrays.asList(line.split("[ \t]")), 
-																																	ADD,
-																																	ADD_REGX),
-																															MUL,
-																															MUL_REGX),
-																													SUB,
-																													SUB_REGX),
-																											DIV,
-																											DIV_REGX),
+																																	splitBy(
+																																			splitBy(
+																																					splitBy(
+																																							splitBy(
+																																									splitBy(
+																																											splitBy(
+																																													splitBy(
+																																															splitBy(
+																																																	splitBy(
+																																																			splitBy(
+																																																					line.split("[ \t]"), 
+																																																					ADD,
+																																																					ADD_REGX),
+																																																			MUL,
+																																																			MUL_REGX),
+																																																	SUB,
+																																																	SUB_REGX),
+																																															DIV,
+																																															DIV_REGX),
+																																													MOD,
+																																													MOD),
+																																											EQ,
+																																											EQ),
+																																									NEQ,
+																																									NEQ),
+																																							GE,
+																																							GE),
+																																					LE,
+																																					LE),
+																																			GT,
+																																			GT),
+																																	LT,
+																																	LT),
+																															AND,
+																															AND),
+																													OR,
+																													OR_REGX),
+																											NEG,
+																											NEG),
 																									DOT,
 																									DOT_REGX),
 																							COMMA, 
@@ -561,36 +635,48 @@
 							RIGHT_SQUARE_BRACKET_REGX));
 		}
 
-		private ArrayList<String> splitBy(final List<String> tokens, final String delimiter, final String delimiterRegx) {
-			ArrayList<String> newTokens = new ArrayList<>();
+		private ArrayList<Token> splitBy(String[] tokens, final String delimiter, final String delimiterRegx) {
+			ArrayList<Token> newTokens = new ArrayList<>();
 			for (String token: tokens) {
-				String[] splitTokens = token.split(delimiterRegx);
-				boolean fFirstToken = true;
-				for (String t: splitTokens) {
-					if (!fFirstToken) {
-						newTokens.add(delimiter);
+				newTokens.add(new Token(token));
+			}
+			return splitBy(newTokens, delimiter, delimiterRegx);
+		}
+ 
+		private ArrayList<Token> splitBy(final List<Token> tokens, final String delimiter, final String delimiterRegx) {
+			ArrayList<Token> newTokens = new ArrayList<>();
+			for (Token token: tokens) {
+				if (token.isAtomic()) {
+					newTokens.add(token);
+				} else {
+					String[] splitTokens = token.split(delimiterRegx);
+					boolean fFirstToken = true;
+					for (String t: splitTokens) {
+						if (!fFirstToken) {
+							newTokens.add(new Token(delimiter, true));
+						}
+						if (t.length() > 0) {
+							newTokens.add(new Token(t));
+						}
+						fFirstToken = false;
 					}
-					if (t.length() > 0) {
-						newTokens.add(t);
+					while (token.endsWith(delimiter)) {
+						newTokens.add(new Token(delimiter, true));
+						token = token.substring(0, token.length() - 1);
 					}
-					fFirstToken = false;
-				}
-				while (token.endsWith(delimiter)) {
-					newTokens.add(delimiter);
-					token = token.substring(0, token.length() - 1);
 				}
 			}
 			return newTokens;
 		}
-
-		public String next() {
+		
+ 		public String next() {
 			if (line >= tokens.size()) return null;
 			while (n >= tokens.get(line).size()) {
 				line++;
 				n = 0;
 				if (line >= tokens.size()) return null;
 			}
-			String token = tokens.get(line).get(n);
+			String token = tokens.get(line).get(n).getTokenStr();
 			n++;
 			return token;
 		}
@@ -602,7 +688,7 @@
 				n = 0;
 				if (line >= tokens.size()) return null;
 			}
-			return tokens.get(line).get(n);
+			return tokens.get(line).get(n).getTokenStr();
 		}
 
 		public boolean hasNext() {
@@ -627,4 +713,42 @@
 			return text;
 		}
 	}
+	
+	public static class Token {
+		String token;
+		boolean isAtomic = false;
+		
+		public Token(String token) {
+			this.token = token;
+		}
+	
+		public Token(String token, boolean isAtomic) {
+			this.token = token;
+			this.isAtomic = isAtomic;
+		}
+		
+		public String getTokenStr() {
+			return token;
+		}
+		
+		public boolean isAtomic() {
+			return isAtomic;
+		}
+		
+		public String[] split(String delimiterRegx) {
+			return token.split(delimiterRegx);
+		}
+	
+		public boolean endsWith(String delimiter) {
+			return token.endsWith(delimiter);
+		}
+	
+		public int length() {
+			return token.length();
+		}
+	
+		public Token substring(int beginIdx, int endIdx) {
+			return new Token(token.substring(beginIdx, endIdx));
+		}
+	}
 }
diff --git a/AlgebraicDataflowArchitectureModel/src/tests/DataFlowModelTest.java b/AlgebraicDataflowArchitectureModel/src/tests/DataFlowModelTest.java
deleted file mode 100644
index cea2cee..0000000
--- a/AlgebraicDataflowArchitectureModel/src/tests/DataFlowModelTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package tests;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import models.*;
-import models.dataConstraintModel.*;
-import models.dataFlowModel.*;
-
-public class DataFlowModelTest {
-
-	@Test
-	public void test() {
-		// Construct a data-flow architecture model.
-		DataTransferModel model = new DataTransferModel();
-		ResourcePath customer_off = new ResourcePath("customers.{x1}.off", 1);		// an identifier template to specify a customer's office resource
-		ResourcePath company_add = new ResourcePath("companies.{x2}.add", 1);		// an identifier template to specify a companie's address resource
-		ResourcePath customer_add = new ResourcePath("customers.{x1}.add", 1);		// an identifier template to specify a customer's address resource
-		
-		// === gin_1 ===
-		//
-		// customers.{x1}.off(c, set(x)) == x
-		// customers.{x1}.off(c, e) == c
-		//
-		DataTransferChannel gin_1 = new DataTransferChannel("gin_1");	// set customer's office (an input channel)
-//		GroupSelector x1 = new GroupSelector();
-		ChannelMember customer_off_1 = new ChannelMember(customer_off);
-//		customer_off_1.addSelector(x1);				// x1 is determined by the path parameter in customer's office template, and serves as a group selector in this channel
-		gin_1.addChannelMember(customer_off_1);
-		assertEquals(customer_off.getNumberOfParameters(), customer_off_1.getSelectors().size());
-		
-		// === gin_2 ===
-		//
-		// companies.{x2}.add(a, set(y)) == y
-		// companies.{x2}.add(a, e) == a
-		//
-		DataTransferChannel gin_2 = new DataTransferChannel("gin_2");	// set companie's address (an input channel)
-//		GroupSelector x2 = new GroupSelector();
-		ChannelMember company_add_1 = new ChannelMember(company_add);
-//		company_add_1.addSelector(x2);				// x2 is determined by the path parameter in companie's address template, and serves as a group selector in this channel
-		gin_2.addChannelMember(company_add_1);		
-		assertEquals(company_add.getNumberOfParameters(), company_add_1.getSelectors().size());
-		
-		// === g ===
-		//		
-		// customers.{x3}.off( c, update(y, z)) == y
-		// companies.{y}.add( a1, update(y, z)) == z
-		// customers.{x3}.add(a2, update(y, z)) == z
-		//
-		DataTransferChannel g = new DataTransferChannel("g");		// update customer's address
-//		GroupSelector x3 = new GroupSelector();
-//		ChannelSelector y = new ChannelSelector();
-		ChannelMember customer_off_2 = new ChannelMember(customer_off);
-		ChannelMember company_add_2 = new ChannelMember(company_add);
-		ChannelMember customer_add_2 = new ChannelMember(customer_add);
-//		customer_off_2.addSelector(x3);				// x3 is determined by the path parameter in customer's office template, and serves as a group selector in this channel
-//		company_add_2.addSelector(y);				// y is determined by the value of the customer's office resource, and serves as a channel selector in this channel
-//		customer_add_2.addSelector(x3);				// x3 determines the path parameter in customer's address template to update
-		g.addChannelMemberAsInput(customer_off_2);
-		g.addChannelMemberAsInput(customer_add_2);
-		g.addChannelMemberAsOutput(company_add_2);
-		assertEquals(customer_off.getNumberOfParameters(), customer_off_2.getSelectors().size());
-		assertEquals(customer_add.getNumberOfParameters(), customer_add_2.getSelectors().size());
-		assertEquals(company_add.getNumberOfParameters(), company_add_2.getSelectors().size());
-		
-		// Construct a data-flow architecture model.
-		model.addIOChannel(gin_1);
-		model.addIOChannel(gin_2);
-		model.addChannel(g);
-		
-		// Check the model.
-		assertEquals(3, model.getResourcePaths().size());
-		assertEquals(2, model.getIOChannels().size());
-		assertEquals(1, model.getChannels().size());
-		
-		// Extract the resource dependency graph.
-		DataFlowGraph resourceDependencyGraph = model.getDataFlowGraph();
-		
-		// Check the graph.
-		assertEquals(3, resourceDependencyGraph.getNodes().size());
-		assertEquals(2, resourceDependencyGraph.getEdges().size());
-		for (Edge e: resourceDependencyGraph.getEdges()) {
-			System.out.println(e.getSource() + "-(" + e + ")->" + e.getDestination());
-		}
-	}
-
-}
diff --git a/AlgebraicDataflowArchitectureModel/src/tests/DataTransferModelTest.java b/AlgebraicDataflowArchitectureModel/src/tests/DataTransferModelTest.java
new file mode 100644
index 0000000..5321eae
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/src/tests/DataTransferModelTest.java
@@ -0,0 +1,88 @@
+package tests;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import models.*;
+import models.dataConstraintModel.*;
+import models.dataFlowModel.*;
+
+public class DataTransferModelTest {
+
+	@Test
+	public void test() {
+		// Construct a data-flow architecture model.
+		DataTransferModel model = new DataTransferModel();
+		ResourcePath customer_off = new ResourcePath("customers.{x1}.off", 1);		// an identifier template to specify a customer's office resource
+		ResourcePath company_add = new ResourcePath("companies.{x2}.add", 1);		// an identifier template to specify a companie's address resource
+		ResourcePath customer_add = new ResourcePath("customers.{x1}.add", 1);		// an identifier template to specify a customer's address resource
+		
+		// === gin_1 ===
+		//
+		// customers.{x1}.off(c, set(x)) = x
+		// customers.{x1}.off(c, e) = c
+		//
+		DataTransferChannel gin_1 = new DataTransferChannel("gin_1");	// set customer's office (an input channel)
+//		GroupSelector x1 = new GroupSelector();
+		ChannelMember customer_off_1 = new ChannelMember(customer_off);
+//		customer_off_1.addSelector(x1);				// x1 is determined by the path parameter in customer's office template, and serves as a group selector in this channel
+		gin_1.addChannelMember(customer_off_1);
+		assertEquals(customer_off.getNumberOfParameters(), customer_off_1.getSelectors().size());
+		
+		// === gin_2 ===
+		//
+		// companies.{x2}.add(a, set(y)) = y
+		// companies.{x2}.add(a, e) = a
+		//
+		DataTransferChannel gin_2 = new DataTransferChannel("gin_2");	// set companie's address (an input channel)
+//		GroupSelector x2 = new GroupSelector();
+		ChannelMember company_add_1 = new ChannelMember(company_add);
+//		company_add_1.addSelector(x2);				// x2 is determined by the path parameter in companie's address template, and serves as a group selector in this channel
+		gin_2.addChannelMember(company_add_1);		
+		assertEquals(company_add.getNumberOfParameters(), company_add_1.getSelectors().size());
+		
+		// === g ===
+		//		
+		// customers.{x3}.off( c, update(y, z)) = y
+		// companies.{y}.add( a1, update(y, z)) = z
+		// customers.{x3}.add(a2, update(y, z)) = z
+		//
+		DataTransferChannel g = new DataTransferChannel("g");		// update customer's address
+//		GroupSelector x3 = new GroupSelector();
+//		ChannelSelector y = new ChannelSelector();
+		ChannelMember customer_off_2 = new ChannelMember(customer_off);
+		ChannelMember company_add_2 = new ChannelMember(company_add);
+		ChannelMember customer_add_2 = new ChannelMember(customer_add);
+//		customer_off_2.addSelector(x3);				// x3 is determined by the path parameter in customer's office template, and serves as a group selector in this channel
+//		company_add_2.addSelector(y);				// y is determined by the value of the customer's office resource, and serves as a channel selector in this channel
+//		customer_add_2.addSelector(x3);				// x3 determines the path parameter in customer's address template to update
+		g.addChannelMemberAsInput(customer_off_2);
+		g.addChannelMemberAsInput(customer_add_2);
+		g.addChannelMemberAsOutput(company_add_2);
+		assertEquals(customer_off.getNumberOfParameters(), customer_off_2.getSelectors().size());
+		assertEquals(customer_add.getNumberOfParameters(), customer_add_2.getSelectors().size());
+		assertEquals(company_add.getNumberOfParameters(), company_add_2.getSelectors().size());
+		
+		// Construct a data-flow architecture model.
+		model.addIOChannel(gin_1);
+		model.addIOChannel(gin_2);
+		model.addChannel(g);
+		
+		// Check the model.
+		assertEquals(3, model.getResourcePaths().size());
+		assertEquals(2, model.getIOChannels().size());
+		assertEquals(1, model.getChannels().size());
+		
+		// Extract the resource dependency graph.
+		DataFlowGraph resourceDependencyGraph = model.getDataFlowGraph();
+		
+		// Check the graph.
+		assertEquals(3, resourceDependencyGraph.getNodes().size());
+		assertEquals(2, resourceDependencyGraph.getEdges().size());
+		for (Edge e: resourceDependencyGraph.getEdges()) {
+			System.out.println(e.getSource() + "-(" + e + ")->" + e.getDestination());
+		}
+	}
+
+}
diff --git a/AlgebraicDataflowArchitectureModel/src/tests/UpdateCodeGenerationTest.java b/AlgebraicDataflowArchitectureModel/src/tests/UpdateCodeGenerationTest.java
index 69a5b1f..583dc89 100644
--- a/AlgebraicDataflowArchitectureModel/src/tests/UpdateCodeGenerationTest.java
+++ b/AlgebraicDataflowArchitectureModel/src/tests/UpdateCodeGenerationTest.java
@@ -105,8 +105,8 @@
 		
 		// === c1 ===
 		//
-		// payment(p1, update1(y)) == y
-		// loyalty(l, update1(y)) == floor(y * 0.05)
+		// payment(p1, update1(y)) = y
+		// loyalty(l, update1(y)) = floor(y * 0.05)
 		//
 		DataTransferChannel c1 = new DataTransferChannel("c1");
 		ChannelMember c1_payment = new ChannelMember(payment);
@@ -172,8 +172,8 @@
 		
 		// === c2 ===
 		//
-		// payment(p1, update2(z)) == z
-		// history(h, update2(z)) == cons(z, h)
+		// payment(p1, update2(z)) = z
+		// history(h, update2(z)) = cons(z, h)
 		//
 		DataTransferChannel c2 = new DataTransferChannel("c2");
 		ChannelMember c2_payment = new ChannelMember(payment);