diff --git a/greeting/greeting.sw.yaml b/greeting/greeting.sw.yaml
index b4c1c5af..fe701977 100755
--- a/greeting/greeting.sw.yaml
+++ b/greeting/greeting.sw.yaml
@@ -15,21 +15,21 @@ states:
   - name: ChooseOnLanguage
     type: switch
     dataConditions:
-      - condition: "${$.[?(@.language  == 'English')]}"
+      - condition: .language  == "English"
         transition: GreetInEnglish
-      - condition: "${$.[?(@.language  == 'Spanish')]}"
+      - condition: .language  == "Spanish"
         transition: GreetInSpanish
     defaultCondition:
       transition: GreetInEnglish
   - name: GreetInEnglish
     type: inject
     data:
-      greeting: 'Hello from YAML Workflow, '
+      greeting: 'Hello from YAML Workflow'
     transition: GreetPerson
   - name: GreetInSpanish
     type: inject
     data:
-      greeting: 'Saludos desde YAML Workflow, '
+      greeting: 'Saludos desde YAML Workflow'
     transition: GreetPerson
   - name: GreetPerson
     type: operation
@@ -38,6 +38,6 @@ states:
         functionRef:
           refName: greetFunction
           arguments:
-            message: "$.greeting $.name"
+            message: .greeting
     end:
       terminate: true
\ No newline at end of file