diff --git a/Applicatie/ControlPanel.java b/Applicatie/ControlPanel.java
index b371fb7..d78de55 100644
--- a/Applicatie/ControlPanel.java
+++ b/Applicatie/ControlPanel.java
@@ -115,7 +115,7 @@ public class ControlPanel extends JPanel
 			peopleButton.addActionListener(new ActionListener(){
 				public void actionPerformed(ActionEvent e)
 				{
-					p.addVisitors(1);
+					p.addVisitors();
 				}
 			});
 			peoplePanel.add(peopleButton);
diff --git a/Applicatie/Panel.java b/Applicatie/Panel.java
index 9b9c1fa..fef8188 100644
--- a/Applicatie/Panel.java
+++ b/Applicatie/Panel.java
@@ -74,7 +74,7 @@ public class Panel extends JPanel implements ActionListener
 	Point2D selectionPosition = new Point(0, 0);
 	Images images = new Images();
 	javax.swing.Timer t;
-
+	
 	SimpleDateFormat formatter;
 	GregorianCalendar date;
 
@@ -148,7 +148,6 @@ public class Panel extends JPanel implements ActionListener
 		addMouseWheelListener(new MouseWheel(this));
 
 		addFocusListener(new WindowFocusListener(this));
-
 		t = new Timer(1000 / 10, this);
 	}
 
@@ -220,14 +219,27 @@ public class Panel extends JPanel implements ActionListener
 
 	public void addVisitors()
 	{
-		visitors.add(new Visitor("visitor", new Point(100, 300), agenda, objects));
+		ArrayList<DrawObject> entrances = new ArrayList<>();
+		for(DrawObject object : objects) {
+			if(object instanceof Entrance) {
+				entrances.add(object);
+			}
+		}
+		if(!entrances.isEmpty()) {
+			DrawObject entrance = entrances.get((int) Math.floor(Math.random()*entrances.size()));
+			Point point = new Point((int)entrance.getPosition().getX(),(int)entrance.getPosition().getY());
+			visitors.add(new Visitor("visitor",point, agenda, objects));
+		}
+		else {
+			JOptionPane.showMessageDialog(this, "You don't have a entrance");
+		}
 	}
 
 	public void addVisitors(int count)
 	{
 		for (int i = 0; i < count; i++)
 		{
-			visitors.add(new Visitor("visitor", new Point(100, 300), agenda, objects));
+			addVisitors();
 		}
 	}
 
@@ -663,6 +675,7 @@ public class Panel extends JPanel implements ActionListener
 			case 4:
 				background = stone;
 				break;
+
 		}
 		repaint();
 	}
diff --git a/Listeners/Mouse.java b/Listeners/Mouse.java
index 7adbaf1..75d8b1c 100644
--- a/Listeners/Mouse.java
+++ b/Listeners/Mouse.java
@@ -11,6 +11,7 @@ import javax.swing.SwingUtilities;
 
 import Applicatie.Panel;
 import Applicatie.PathPopup;
+
 import Applicatie.Waypoint;
 import Applicatie.WaypointPopup;
 import Objects.DrawObject;
@@ -78,6 +79,7 @@ public class Mouse extends MouseAdapter
 							if (o instanceof Waypoint)
 							{
 								new WaypointPopup(o, panel);
+
 							}
 						}
 						if (o == selectedObject)
diff --git a/Objects/Path.java b/Objects/Path.java
index 6acf774..010303b 100644
--- a/Objects/Path.java
+++ b/Objects/Path.java
@@ -116,6 +116,7 @@ public class Path
 		return false;
 	}
 
+
 	public boolean intersectsRect(Rectangle2D rect)
 	{
 		for (Shape line : getPath())
@@ -145,6 +146,7 @@ public class Path
 			lines.add(stroke.createStrokedShape(line));
 		}
 		return lines;
+
 	}
 
 	public void addWaypoint(int i, Panel panel)
@@ -160,6 +162,7 @@ public class Path
 
 	}
 
+
 	/**
 	 * Add a point to the path.
 	 *