diff --git a/aqua-hll.jar b/aqua-hll.jar
deleted file mode 100644
index c696f1b..0000000
Binary files a/aqua-hll.jar and /dev/null differ
diff --git a/package-lock.json b/package-lock.json
index 82884e1..1f5083e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,10 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@fluencelabs/aquamarine": {
+      "version": "file:fluencelabs-aquamarine-1.0.0.tgz",
+      "integrity": "sha512-ukaTE6QmlRKFB+JJF3n96txkGirMs8gfgptw8N5bU6VHp3OcvTsl59F1Xr83zFiLO67dl3epWDOHkPEAGGtJig=="
+    },
     "@fluencelabs/aquamarine-interpreter": {
       "version": "0.7.2",
       "resolved": "https://registry.npmjs.org/@fluencelabs/aquamarine-interpreter/-/aquamarine-interpreter-0.7.2.tgz",
diff --git a/package.json b/package.json
index 002b1b1..113930e 100644
--- a/package.json
+++ b/package.json
@@ -18,11 +18,13 @@
   "scripts": {
     "build": "tsc",
     "cli": "node -r ts-node/register src/index.ts",
-    "compile-aqua": "java -jar ./aqua-hll.jar -i ./src/aqua/ -o ./src/compiled"
+    "compile-aqua": "java -jar ./aqua-hll.jar -i ./src/aqua/ -o ./src/compiled",
+    "compile": "aquamarine -i ./src/aqua/ -o ./src/compiled"
   },
   "devDependencies": {
     "ts-node": "^9.1.1",
-    "typescript": "^4.2.4"
+    "typescript": "^4.2.4",
+    "@fluencelabs/aquamarine": "file:fluencelabs-aquamarine-1.0.0.tgz"
   },
   "dependencies": {
     "@fluencelabs/fluence": "0.9.34",
diff --git a/src/compiled/helloWorld.ts b/src/compiled/helloWorld.ts
index 85fe442..bb93657 100644
--- a/src/compiled/helloWorld.ts
+++ b/src/compiled/helloWorld.ts
@@ -1,62 +1,62 @@
-import { FluenceClient, PeerIdB58 } from "@fluencelabs/fluence";
-import { RequestFlowBuilder } from "@fluencelabs/fluence/dist/api.unstable";
+import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
+import { RequestFlowBuilder } from '@fluencelabs/fluence/dist/api.unstable';
 
-export async function getPeerExternalAddresses(
-  client: FluenceClient,
-  otherNodePeerId: string
-): Promise<string[]> {
-  let request;
-  const promise = new Promise<string[]>((resolve, reject) => {
-    request = new RequestFlowBuilder()
-      .withRawScript(
-        `
-(seq
+
+
+export async function getPeerExternalAddresses(client: FluenceClient, otherNodePeerId: string): Promise<string[]> {
+    let request;
+    const promise = new Promise<string[]>((resolve, reject) => {
+        request = new RequestFlowBuilder()
+            .withRawScript(
+                `
+(xor
  (seq
   (seq
    (seq
-    (call %init_peer_id% ("getDataSrv" "otherNodePeerId") [] otherNodePeerId)
-    (call %init_peer_id% ("getDataSrv" "relay") [] relay)
-   )
-   (seq
-    (call relay ("op" "identity") [])
-    (call otherNodePeerId ("peer" "identify") [] res)
+    (seq
+     (call %init_peer_id% ("getDataSrv" "otherNodePeerId") [] otherNodePeerId)
+     (call %init_peer_id% ("getDataSrv" "relay") [] relay)
+    )
+    (seq
+     (call relay ("op" "identity") [])
+     (call otherNodePeerId ("peer" "identify") [] res)
+    )
    )
+   (call relay ("op" "identity") [])
   )
-  (call relay ("op" "identity") [])
+  (call %init_peer_id% ("callbackSrv" "response") [res.$.external_addresses!])
  )
- (call %init_peer_id% ("callbackSrv" "response") [res.$.external_addresses!])
+ (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error%])
 )
 
-            `
-      )
-      .configHandler((h) => {
-        h.on("getDataSrv", "relay", () => {
-          return client.relayPeerId;
-        });
-        h.on("getRelayService", "hasReleay", () => {
-          // Not Used
-          return client.relayPeerId !== undefined;
-        });
-        h.on("getDataSrv", "otherNodePeerId", () => {
-          return otherNodePeerId;
-        });
-        h.on("callbackSrv", "response", (args) => {
-          const [res] = args;
-          resolve(res);
-        });
+            `,
+            )
+            .configHandler((h) => {
+                h.on('getDataSrv', 'relay', () => {
+                    return client.relayPeerId;
+                });
+                h.on('getRelayService', 'hasReleay', () => {// Not Used
+                    return client.relayPeerId !== undefined;
+                });
+                h.on('getDataSrv', 'otherNodePeerId', () => {return otherNodePeerId;});
+                h.on('callbackSrv', 'response', (args) => {
+  const [res] = args;
+  resolve(res);
+});
 
-        h.on("nameOfServiceWhereToSendXorError", "errorProbably", (args) => {
-          // assuming error is the single argument
-          const [err] = args;
-          reject(err);
-        });
-      })
-      .handleScriptError(reject)
-      .handleTimeout(() => {
-        reject("Request timed out");
-      })
-      .build();
-  });
-  await client.initiateFlow(request);
-  return promise;
+                h.on('errorHandlingSrv', 'error', (args) => {
+                    // assuming error is the single argument
+                    const [err] = args;
+                    reject(err);
+                });
+            })
+            .handleScriptError(reject)
+            .handleTimeout(() => {
+                reject('Request timed out');
+            })
+            .build();
+    });
+    await client.initiateFlow(request);
+    return promise;
 }
+      
\ No newline at end of file