diff --git a/cocotbext/waves/waves.py b/cocotbext/waves/waves.py
index 608dcbf..992a936 100644
--- a/cocotbext/waves/waves.py
+++ b/cocotbext/waves/waves.py
@@ -4,7 +4,7 @@
 # License           : MIT license <Check LICENSE>
 # Author            : Anderson I. da Silva (aignacio) <anderson@aignacio.com>
 # Date              : 25.10.2024
-# Last Modified Date: 29.10.2024
+# Last Modified Date: 31.10.2024
 import cocotb
 import wavedrom
 import json
@@ -320,7 +320,15 @@ def _close(self):
             self.waves["head"] = self.head
             self.waves["foot"] = self.foot
 
-    def save(self):
+    def __str__(self):
+        return str(json.dumps(self.waves))
+
+    def stop(self):
+        self._close()
+        if self.debug:
+            print("[Waves - Debug] Stopping sims")
+
+    def save_svg(self):
         self._close()
         if self.debug:
             print("[Waves - Debug] Printing JSON Wavedrom")
diff --git a/tests/test_gen_ahb_waves.py b/tests/test_gen_ahb_waves.py
index 1264c6b..22d1844 100644
--- a/tests/test_gen_ahb_waves.py
+++ b/tests/test_gen_ahb_waves.py
@@ -4,7 +4,7 @@
 # License           : MIT license <Check LICENSE>
 # Author            : Anderson I. da Silva (aignacio) <anderson@aignacio.com>
 # Date              : 25.10.2024
-# Last Modified Date: 25.10.2024
+# Last Modified Date: 31.10.2024
 import cocotb
 import os
 import random
@@ -93,7 +93,7 @@ async def run_test(dut, bp_fn=None, pip_mode=False):
 
     resp = await ahb_master.write(address, value, size, pip=pip_mode, verbose=True)
     resp = await ahb_master.read(address, size, pip=pip_mode, verbose=True)
-    waves.save()
+    waves.save_svg()
     type(resp)
     del waves
 
diff --git a/tests/test_gen_ahb_waves_ram.py b/tests/test_gen_ahb_waves_ram.py
index d455be4..5e95a82 100644
--- a/tests/test_gen_ahb_waves_ram.py
+++ b/tests/test_gen_ahb_waves_ram.py
@@ -4,7 +4,7 @@
 # License           : MIT license <Check LICENSE>
 # Author            : Anderson I. da Silva (aignacio) <anderson@aignacio.com>
 # Date              : 25.10.2024
-# Last Modified Date: 26.10.2024
+# Last Modified Date: 31.10.2024
 import cocotb
 import os
 import random
@@ -88,7 +88,8 @@ async def run_test(dut):
     resp = await ahb_master.write(address, value, size, pip=pip_mode)
     resp = await ahb_master.read(address, size, pip=pip_mode)
 
-    waves.save()
+    print(waves)
+    waves.save_svg()
     waves.save_txt()
     type(resp)
     del waves
diff --git a/tests/test_gen_ahb_waves_trigger.py b/tests/test_gen_ahb_waves_trigger.py
index 5cd9f75..9460502 100644
--- a/tests/test_gen_ahb_waves_trigger.py
+++ b/tests/test_gen_ahb_waves_trigger.py
@@ -4,7 +4,7 @@
 # License           : MIT license <Check LICENSE>
 # Author            : Anderson I. da Silva (aignacio) <anderson@aignacio.com>
 # Date              : 25.10.2024
-# Last Modified Date: 26.10.2024
+# Last Modified Date: 31.10.2024
 import cocotb
 import os
 import random
@@ -79,7 +79,7 @@ async def run_test(dut):
     resp = await ahb_master.write(address, value, size, verbose=True)
     resp = await ahb_master.read(address, size, verbose=True)
     waves.save()
-    waves.save_txt()
+    waves.save_svg()
     type(resp)
     del waves