diff --git a/scripts/radial/travel_terminal.py b/scripts/radial/travel_terminal.py
index e331c16b..17c725b8 100644
--- a/scripts/radial/travel_terminal.py
+++ b/scripts/radial/travel_terminal.py
@@ -8,9 +8,13 @@ def createRadial(core, owner, target, radials):
 def handleSelection(core, owner, target, option):
 
     if option == 21 and target:
-        tpm = EnterTicketPurchaseModeMessage()
+        tpm = EnterTicketPurchaseModeMessage(owner.getPlanet().getName(), core.mapService.getClosestCityName(owner))
         owner.getClient().getSession().write(tpm.serialize())
-        #print ('Sent EnterTicketPurchaseModeMessage!')
+        #print ('Planet name: ' + owner.getPlanet().getName())
+        #print ('City name: ' + core.mapService.getClosestCityName(owner))
+        
+        
+
     return
     
 def handleSUI(owner, window, eventType, returnList):
diff --git a/scripts/static_travel_points.py b/scripts/static_travel_points.py
index 583a5d22..85a1dda1 100644
--- a/scripts/static_travel_points.py
+++ b/scripts/static_travel_points.py
@@ -21,7 +21,11 @@ def addPoints(core, planet):
     if planet.getName() == 'tatooine':
         tatooinePoints(core, planet)
     if planet.getName() == 'yavin4':
-        yavin4Points(core, planet)                
+        yavin4Points(core, planet)
+    if planet.getName() == 'mustafar':
+        mustafarPoints(core,planet)
+    if planet.getName() == 'kashyyyk_main':
+        kashyyykPoints(core, planet)          
     return
 
 def corelliaPoints(core, planet):
@@ -100,4 +104,15 @@ def yavin4Points(core, planet):
     trvSvc.addTravelPoint(planet, "Imperial Base", 4033, -6234)
     trvSvc.addTravelPoint(planet, "Labor Outpost", -6939, -5706)
     trvSvc.addTravelPoint(planet, "Mining Outpost", -277, 4879)
-    return
\ No newline at end of file
+    return
+
+def mustafarPoints(core, planet):
+    trvSvc = core.travelService
+    
+    trvSvc.addTravelPoint(planet, "Mensix Mining Facility", 4033, -6234)
+    return
+
+def kashyyykPoints(core, planet):
+    trvSvc = core.travelService
+    trvSvc.addTravelPoint(planet, "Kachiro Starport", 4033, -6234)
+    return
diff --git a/src/protocol/swg/EnterTicketPurchaseModeMessage.java b/src/protocol/swg/EnterTicketPurchaseModeMessage.java
index 2deea303..2c5c2315 100644
--- a/src/protocol/swg/EnterTicketPurchaseModeMessage.java
+++ b/src/protocol/swg/EnterTicketPurchaseModeMessage.java
@@ -27,6 +27,14 @@ import org.apache.mina.core.buffer.IoBuffer;
 
 public class EnterTicketPurchaseModeMessage extends SWGMessage {
 
+	public String planetName;
+	public String cityName;
+	
+	public EnterTicketPurchaseModeMessage(String planetName, String cityName) {
+		this.planetName = planetName;
+		this.cityName = cityName;
+	}
+	
 	@Override
 	public void deserialize(IoBuffer data) {
 		// TODO Auto-generated method stub
@@ -40,8 +48,8 @@ public class EnterTicketPurchaseModeMessage extends SWGMessage {
 		result.putShort((short) 3);
 		result.putInt(0x904DAE1A);
 		
-		result.put(getAsciiString("tatooine")); // lowercase
-		result.put(getAsciiString("Mos Eisley")); // city
+		result.put(getAsciiString(planetName));
+		result.put(getAsciiString(cityName + " Starport"));
 		
 		return result.flip();
 	}