diff --git a/UltiSnips/coffee.snippets b/UltiSnips/coffee.snippets
index db7e985..3e923dc 100644
--- a/UltiSnips/coffee.snippets
+++ b/UltiSnips/coffee.snippets
@@ -1,7 +1,8 @@
 # From the TextMate bundle
+# with some modification
 
 snippet fun "Function" b
-${1:name} = (${2:args}) ->
+${1:name} = ${2:(${3:args}) }->
 	${0:# body...}
 endsnippet
 
@@ -10,12 +11,12 @@ ${1:(${2:args}) }=>
 	${0:# body...}
 endsnippet
 
-snippet if "If" b
+snippet if "If"
 if ${1:condition}
 	${0:# body...}
 endsnippet
 
-snippet ife "If .. Else" b
+snippet ife "If .. Else"
 if ${1:condition}
 	${2:# body...}
 else
@@ -27,40 +28,46 @@ else if ${1:condition}
 	${0:# body...}
 endsnippet
 
-snippet ifte "Ternary if" b
+snippet ifte "Ternary if"
 if ${1:condition} then ${2:value} else ${3:other}
 endsnippet
 
-snippet unl "Unless" b
+snippet unl "Unless"
 ${1:action} unless ${2:condition}
 endsnippet
 
-snippet fora "Array Comprehension" b
+snippet fora "Array Comprehension"
 for ${1:name} in ${2:array}
 	${0:# body...}
 endsnippet
 
-snippet foro "Object Comprehension" b
+snippet foro "Object Comprehension"
 for ${1:key}, ${2:value} of ${3:Object}
 	${0:# body...}
 endsnippet
 
-snippet forr "Range Comprehension (inclusive)" b
+snippet forr "Range Comprehension (inclusive)"
 for ${1:name} in [${2:start}..${3:finish}]${4: by ${5:step}}
 	${0:# body...}
 endsnippet
 
-snippet forrex "Range Comprehension (exclusive)" b
+snippet forrex "Range Comprehension (exclusive)"
 for ${1:name} in [${2:start}...${3:finish}]${4: by ${5:step}}
 	${0:# body...}
 endsnippet
 
-snippet swi "Switch" b
+snippet swi "Switch"
 switch ${1:object}
 	when ${2:value}
 		${3:# body...}
 	else
-		${0:# body...}
+		$0
+endsnippet
+
+snippet swit "Switch when .. then"
+switch ${1:object}
+	when ${2:${3:condition} then ${4:value}}
+	else ${0:value}
 endsnippet
 
 snippet cla "Class" b
@@ -71,7 +78,7 @@ class ${1:ClassName}${2: extends ${3:Ancestor}}
 	$7
 endsnippet
 
-snippet try "Try .. Catch" b
+snippet try "Try .. Catch"
 try
 	$1
 catch ${2:error}