diff --git a/nostr_dvm/subscription.py b/nostr_dvm/subscription.py
index 0437484..bfee47a 100644
--- a/nostr_dvm/subscription.py
+++ b/nostr_dvm/subscription.py
@@ -72,7 +72,6 @@ class Subscription:
 
             def handle(self, relay_url, subscription_id, nostr_event: Event):
                 if nostr_event.kind().as_u64() == 5906:  # TODO add to list of events
-                    print(nostr_event.as_json())
                     handle_nwc_request(nostr_event)
                 elif nostr_event.kind().as_u64() == EventDefinitions.KIND_NIP88_STOP_SUBSCRIPTION_EVENT.as_u64():
                     handle_cancel(nostr_event)
@@ -158,11 +157,15 @@ class Subscription:
             print(overallsplit)
             zapped_amount = 0
             for zap in zaps:
+                if zap[1] == "":
+                    zap[1] = Keys.parse(self.dvm_config.PRIVATE_KEY).public_key().to_hex()
+
                 name, nip05, lud16 = fetch_user_metadata(zap[1], self.client)
                 splitted_amount = math.floor(
-                    (int(zap[2]) / overallsplit) * int(overall_amount) / 1000)
+                    (int(zap[1]) / overallsplit) * int(overall_amount) / 1000)
                 # invoice = create_bolt11_lud16(lud16, splitted_amount)
                 # TODO add details about DVM in message
+
                 invoice = zaprequest(lud16, splitted_amount, tier, None,
                                      PublicKey.parse(zap[1]), self.keys, DVMConfig.RELAY_LIST)
                 print(invoice)
@@ -177,7 +180,6 @@ class Subscription:
             if zapped_amount < overall_amount * 0.8:  # TODO how do we handle failed zaps for some addresses? we are ok with 80% for now
                 success = False
             else:
-                print("Zapped successfully")
                 success = True
                 # if no active subscription exists OR the subscription ended, pay
 
@@ -321,6 +323,14 @@ class Subscription:
                         send_status_success(nostr_event, "noogle.lol")
 
 
+                        keys = Keys.parse(dvm_config.PRIVATE_KEY)
+                        message = ("Subscribed to DVM " + subscription.tier + ". Renewing on: " + str(
+                            Timestamp.from_secs(end).to_human_datetime().replace("Z", " ").replace("T", " ")))
+                        evt = EventBuilder.encrypted_direct_msg(keys, PublicKey.parse(subscription.subscriber), message,
+                                                                None).to_event(keys)
+                        send_event(evt, client=self.client, dvm_config=dvm_config)
+
+
 
                 except Exception as e:
                     print(e)
@@ -373,8 +383,18 @@ class Subscription:
                                                               subscription.tier_dtag, subscription.zaps, recipe,
                                                               success,
                                                               Timestamp.now().as_secs(), subscription.tier)
+
                                 print("updated subscription entry")
 
+                          
+                                keys = Keys.parse(dvm_config.PRIVATE_KEY)
+                                message = ("Renewed Subscription to DVM " + subscription.tier + ". Next renewal: " + str(
+                                    Timestamp.from_secs(end).to_human_datetime().replace("Z", " ").replace( "T", " ")))
+                                evt = EventBuilder.encrypted_direct_msg(keys, PublicKey.parse(subscription.subscriber), message,
+                                                                        None).to_event(keys)
+                                send_event(evt, client=self.client, dvm_config=dvm_config)
+
+
 
                     else:
                         delete_threshold = 60 * 60 * 24 * 365
diff --git a/nostr_dvm/utils/database_utils.py b/nostr_dvm/utils/database_utils.py
index 461ad7e..feddbe3 100644
--- a/nostr_dvm/utils/database_utils.py
+++ b/nostr_dvm/utils/database_utils.py
@@ -213,16 +213,6 @@ def update_user_subscription(npub, subscribed_until, client, dvm_config):
                          Timestamp.now().as_secs(), subscribed_until)
         print("Updated user subscription for: " + str(user.name))
 
-        if dvm_config is not None:
-            keys = Keys.parse(dvm_config.PRIVATE_KEY)
-            # time.sleep(1.0)
-
-            message = ("Subscribed to DVM " + dvm_config.NIP89.NAME + " until: " + str(
-                Timestamp.from_secs(subscribed_until).to_human_datetime().replace("Z", " ").replace("T", " ")))
-
-            evt = EventBuilder.encrypted_direct_msg(keys, PublicKey.from_hex(npub), message,
-                                                    None).to_event(keys)
-            send_event(evt, client=client, dvm_config=dvm_config)
 
 
 def get_or_add_user(db, npub, client, config, update=False, skip_meta = False):