diff --git a/README.md b/README.md
index 5049bd8..b124942 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ other features
 
 - Various solar details
   - `sun` returns the sunrise and set for the day
+    - uses the locaton of the node if known
   - `solar` gives an idea of the x-ray flux
   - `hfcond` returns a table of HF solar conditions
 
@@ -33,7 +34,7 @@ It is recomended to leave this setting as default `True` to keep the channel cle
 ```
 RESPOND_BY_DM_ONLY = True # Set to True to respond messages via DM only (keeps the channel clean)
  ```
- Solar Data needs the LAT LONG for your area on the [solarconditions.py](solarconditions.py)
+ Solar Data needs the LAT LONG for your area on the [solarconditions.py](solarconditions.py) used for when node has no location in the db
 ```
 LATITUDE = 48.50
 LONGITUDE = -123.0
diff --git a/mesh-bot.py b/mesh-bot.py
index 41306af..939cf42 100644
--- a/mesh-bot.py
+++ b/mesh-bot.py
@@ -30,7 +30,7 @@ except Exception as e:
     print(f"System: Critical Error script abort. {e}")
     exit()
 
-def auto_response(message,snr,rssi,hop):
+def auto_response(message,snr,rssi,hop,message_from_id):
     #Auto response to messages
     if "ping" in message.lower():
         #Check if the user added @foo to the message
@@ -65,7 +65,11 @@ def auto_response(message,snr,rssi,hop):
     elif "help" in message.lower():
         bot_response = help_message
     elif "sun" in message.lower():
-        suntime = get_sunrise_sunset()
+        location = get_node_location(message_from_id)
+        lat = location[0]
+        lon = location[1]
+        print (f"Using Reported Location: {location}")
+        suntime = get_sunrise_sunset(lat,lon)
         bot_response = "Sunrise: " + suntime[0] + "\nSunset: " + suntime[1]
     elif "hfcond" in message.lower():
         bot_response = hf_band_conditions()
@@ -132,20 +136,20 @@ def onReceive(packet, interface):
                 if messageTrap(message_string):
                     print(f"{log_timestamp()} Received DM: {message_string} on Channel: {channel_number} From: {get_name_from_number(message_from_id)}")
                     # respond with a direct message
-                    send_message(auto_response(message_string,snr,rssi,hop),channel_number,message_from_id)
+                    send_message(auto_response(message_string,snr,rssi,hop,message_from_id),channel_number,message_from_id)
                 else: 
                     #respond with welcome message
                     print(f"{log_timestamp()} Ignoring DM: {message_string} From: {get_name_from_number(message_from_id)}")
-                    send_message(welcome_message,channel_number,message_from_id)
+                    send_message(welcome_message,channel_number,message_from_id,message_from_id)
             else:
                 if messageTrap(message_string):
                     print(f"{log_timestamp()} Received On Channel {channel_number}: {message_string} From: {get_name_from_number(message_from_id)}")
                     if RESPOND_BY_DM_ONLY:
                         # respond to channel message via direct message to keep the channel clean
-                        send_message(auto_response(message_string,snr,rssi,hop),channel_number,message_from_id)
+                        send_message(auto_response(message_string,snr,rssi,hop,message_from_id),channel_number,message_from_id)
                     else:
                         # or respond to channel message on the channel itself
-                        send_message(auto_response(message_string,snr,rssi),channel_number,0)
+                        send_message(auto_response(message_string,snr,rssi,message_from_id),channel_number,0)
                 else:
                     print(f"{log_timestamp()} System: Ignoring incoming channel {channel_number}: {message_string} From: {get_name_from_number(message_from_id)}")
                 
@@ -205,6 +209,23 @@ def get_node_list():
     else:
         node_list.append("Nothing heard")
         return node_list
+    
+def get_node_location(number):
+    print (f"Looking for location of {get_name_from_number(number)}")
+    if interface.nodes:
+        for node in interface.nodes.values():
+            if number == node['num']:
+                if 'position' in node:
+                    latitude = node['position']['latitude']
+                    longitude = node['position']['longitude']
+                    print (f"System: location data for {number} is {latitude},{longitude}")
+                    position = [latitude,longitude]
+                    return position
+                else:
+                    print (f"{log_timestamp()} System: No location data for {number}")
+                return [0,0]
+    else:
+        return [0,0]
         
 def send_message(message,ch,nodeid):
     if nodeid == 0:
diff --git a/solarconditions.py b/solarconditions.py
index 64fc713..4b03b23 100644
--- a/solarconditions.py
+++ b/solarconditions.py
@@ -55,8 +55,12 @@ def drap_xray_conditions():
         xray_flux += "error fetching"
     return xray_flux
 
-def get_sunrise_sunset():
-    sun = Sun(LATITUDE, LONGITUDE)
+def get_sunrise_sunset(lat=0, lon=0):
+    if lat != 0 and lon != 0:
+        sun = Sun(lat, lon)
+    else:
+        sun = Sun(LATITUDE, LONGITUDE)
+        
     to_zone = tz.tzlocal()
     today_sr = sun.get_sunrise_time(datetime.now())
     today_ss = sun.get_sunset_time(datetime.now())