diff --git a/Project Undercover/Assets/Resources/PhotonServerSettings.asset b/Project Undercover/Assets/Resources/PhotonServerSettings.asset
index c283137..74a4728 100644
--- a/Project Undercover/Assets/Resources/PhotonServerSettings.asset	
+++ b/Project Undercover/Assets/Resources/PhotonServerSettings.asset	
@@ -57,4 +57,5 @@ MonoBehaviour:
   - ShowGuardsWinScreen
   - ShowSpysWinScreen
   - ShowSpiesWinScreen
+  - SetEnabledRPC
   DisableAutoOpenWizard: 1
diff --git a/Project Undercover/Assets/Scenes/scene.unity b/Project Undercover/Assets/Scenes/scene.unity
index f7e1a6a..def0086 100644
--- a/Project Undercover/Assets/Scenes/scene.unity	
+++ b/Project Undercover/Assets/Scenes/scene.unity	
@@ -121,7 +121,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2}
       propertyPath: m_LocalPosition.y
-      value: 2.856
+      value: 4.33
       objectReference: {fileID: 0}
     - target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2}
       propertyPath: m_LocalPosition.z
@@ -239,6 +239,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   xRotation: 0
   yRotation: 0
+  laserSightEnabled: 0
 --- !u!114 &55707634
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -278,7 +279,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 4294967295
   m_IsActive: 1
 --- !u!4 &115526832
 Transform:
@@ -747,7 +748,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2}
       propertyPath: m_LocalPosition.y
-      value: 2.856
+      value: 4.33
       objectReference: {fileID: 0}
     - target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2}
       propertyPath: m_LocalPosition.z
@@ -861,6 +862,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   xRotation: 0
   yRotation: 0
+  laserSightEnabled: 0
 --- !u!114 &339319396
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1138,6 +1140,62 @@ Transform:
   m_PrefabParentObject: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116,
     type: 2}
   m_PrefabInternal: {fileID: 55707631}
+--- !u!1001 &503663093
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: -2.7139997
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_RootOrder
+      value: 21
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: viewIdField
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: instantiationId
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_Name
+      value: NPC (9)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &522116869
 GameObject:
   m_ObjectHideFlags: 0
@@ -1250,7 +1308,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 4294967295
   m_IsActive: 1
 --- !u!23 &577153996
 MeshRenderer:
@@ -1414,7 +1472,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 1
-  m_StaticEditorFlags: 8
+  m_StaticEditorFlags: 4294967295
   m_IsActive: 1
 --- !u!4 &646484925
 Transform:
@@ -1423,8 +1481,8 @@ Transform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 646484924}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 1.25, z: 3.25}
-  m_LocalScale: {x: 0.5, y: 2.5, z: 3}
+  m_LocalPosition: {x: 0, y: 2, z: 3.25}
+  m_LocalScale: {x: 0.5, y: 4, z: 3}
   m_Children: []
   m_Father: {fileID: 115526832}
   m_RootOrder: 5
@@ -1480,6 +1538,118 @@ MeshFilter:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 646484924}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1001 &661955551
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 1.465
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: -0.799
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_RootOrder
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_Name
+      value: NPC (8)
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: viewIdField
+      value: 13
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: instantiationId
+      value: 13
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+  m_IsPrefabParent: 0
+--- !u!1001 &664560028
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0.813
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_RootOrder
+      value: 13
+      objectReference: {fileID: 0}
+    - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_Name
+      value: NPC (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: viewIdField
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: instantiationId
+      value: 7
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &743938565
 GameObject:
   m_ObjectHideFlags: 0
@@ -1762,6 +1932,58 @@ NavMeshAgent:
   m_BaseOffset: 0.5
   m_WalkableMask: 4294967295
   m_ObstacleAvoidanceType: 2
+--- !u!1001 &992194212
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_RootOrder
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: viewIdField
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: instantiationId
+      value: 6
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+  m_IsPrefabParent: 0
 --- !u!4 &1112250644 stripped
 Transform:
   m_PrefabParentObject: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116,
@@ -1930,7 +2152,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 4294967295
   m_IsActive: 1
 --- !u!23 &1141970348
 MeshRenderer:
@@ -2012,7 +2234,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 8
+  m_StaticEditorFlags: 4294967295
   m_IsActive: 1
 --- !u!23 &1167603079
 MeshRenderer:
@@ -2225,6 +2447,62 @@ MeshFilter:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1243434758}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1001 &1276253893
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: -1.533
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: -0.799
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_RootOrder
+      value: 17
+      objectReference: {fileID: 0}
+    - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_Name
+      value: NPC (5)
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: viewIdField
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: instantiationId
+      value: 12
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &1284539760
 GameObject:
   m_ObjectHideFlags: 0
@@ -2307,6 +2585,118 @@ MeshFilter:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1284539760}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1001 &1300289752
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: -1.533
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_RootOrder
+      value: 15
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: viewIdField
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: instantiationId
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_Name
+      value: NPC (3)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+  m_IsPrefabParent: 0
+--- !u!1001 &1325022915
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: -1.533
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0.813
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_RootOrder
+      value: 16
+      objectReference: {fileID: 0}
+    - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_Name
+      value: NPC (4)
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: viewIdField
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: instantiationId
+      value: 8
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &1339720422
 GameObject:
   m_ObjectHideFlags: 0
@@ -2470,7 +2860,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 1
-  m_StaticEditorFlags: 8
+  m_StaticEditorFlags: 4294967295
   m_IsActive: 1
 --- !u!4 &1430656045
 Transform:
@@ -2479,8 +2869,8 @@ Transform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1430656044}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 1.25, z: -3.25}
-  m_LocalScale: {x: 0.5, y: 2.5, z: 3}
+  m_LocalPosition: {x: 0, y: 2, z: -3.25}
+  m_LocalScale: {x: 0.5, y: 4, z: 3}
   m_Children: []
   m_Father: {fileID: 115526832}
   m_RootOrder: 3
@@ -2580,7 +2970,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 4294967295
   m_IsActive: 1
 --- !u!23 &1475430999
 MeshRenderer:
@@ -3266,6 +3656,118 @@ MeshFilter:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1692556951}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1001 &1781942945
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: -2.7139997
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: -0.799
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_RootOrder
+      value: 23
+      objectReference: {fileID: 0}
+    - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_Name
+      value: NPC (11)
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: viewIdField
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: instantiationId
+      value: 3
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+  m_IsPrefabParent: 0
+--- !u!1001 &1800970182
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: -0.799
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_RootOrder
+      value: 14
+      objectReference: {fileID: 0}
+    - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_Name
+      value: NPC (2)
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: viewIdField
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: instantiationId
+      value: 5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &1807653393
 GameObject:
   m_ObjectHideFlags: 0
@@ -3455,7 +3957,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 4294967295
   m_IsActive: 1
 --- !u!23 &1954217021
 MeshRenderer:
@@ -3521,6 +4023,118 @@ Transform:
   m_Father: {fileID: 115526832}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &2020385500
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 1.4650002
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_RootOrder
+      value: 18
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: viewIdField
+      value: 14
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: instantiationId
+      value: 14
+      objectReference: {fileID: 0}
+    - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_Name
+      value: NPC (6)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+  m_IsPrefabParent: 0
+--- !u!1001 &2036326248
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: -2.714
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0.813
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_RootOrder
+      value: 22
+      objectReference: {fileID: 0}
+    - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_Name
+      value: NPC (10)
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: viewIdField
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: instantiationId
+      value: 2
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &2036898600
 GameObject:
   m_ObjectHideFlags: 0
@@ -3964,3 +4578,59 @@ MeshFilter:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 2116889710}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1001 &2144306898
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 1.4650002
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0.813
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_RootOrder
+      value: 19
+      objectReference: {fileID: 0}
+    - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+      propertyPath: m_Name
+      value: NPC (7)
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: viewIdField
+      value: 15
+      objectReference: {fileID: 0}
+    - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1,
+        type: 2}
+      propertyPath: instantiationId
+      value: 15
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2}
+  m_IsPrefabParent: 0
diff --git a/Project Undercover/Assets/Scenes/scene/NavMesh.asset b/Project Undercover/Assets/Scenes/scene/NavMesh.asset
index f8e094b..07241d1 100644
Binary files a/Project Undercover/Assets/Scenes/scene/NavMesh.asset and b/Project Undercover/Assets/Scenes/scene/NavMesh.asset differ
diff --git a/Project Undercover/Assets/Scenes/scene/NavMesh.asset.meta b/Project Undercover/Assets/Scenes/scene/NavMesh.asset.meta
index d7cfcf6..c8afce7 100644
--- a/Project Undercover/Assets/Scenes/scene/NavMesh.asset.meta	
+++ b/Project Undercover/Assets/Scenes/scene/NavMesh.asset.meta	
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: b1f9d2b2f3968434586b7c398ede29d4
-timeCreated: 1505987547
+timeCreated: 1505993683
 licenseType: Free
 NativeFormatImporter:
   mainObjectFileID: 23800000
diff --git a/Project Undercover/Assets/Scripts/GameManager.cs b/Project Undercover/Assets/Scripts/GameManager.cs
index ae0abf2..85e06b9 100644
--- a/Project Undercover/Assets/Scripts/GameManager.cs	
+++ b/Project Undercover/Assets/Scripts/GameManager.cs	
@@ -49,19 +49,22 @@ public class GameManager : Photon.PunBehaviour {
         }
         else
         {
+            guardCamera.GetComponent<GuardCamera>().laserSightEnabled = true;
             Vector3 randPos = SimpleNPCBehavior.GetRandomLocation();
             var spy = PhotonNetwork.Instantiate(spyPrefab.name, randPos, Quaternion.identity, 0);
             spy.GetComponent<PlayerController>().enabled = true;
             spy.GetComponent<Spy>().SetColor();
         }
+        /*
         if (PhotonNetwork.isMasterClient)
         {
             for (int i = 0; i < numNCPs; i++)
             {
                 Vector3 randPos = SimpleNPCBehavior.GetRandomLocation();
-                var npc = PhotonNetwork.Instantiate(NCPPrefab.name, randPos, Quaternion.identity, 0);
+                PhotonNetwork.Instantiate(NCPPrefab.name, randPos, Quaternion.identity, 0);
             }
-        }
+        }*/
+
     }
 
     public void CompleteMission()
diff --git a/Project Undercover/Assets/Scripts/GuardCamera.cs b/Project Undercover/Assets/Scripts/GuardCamera.cs
index ef0e26e..e7f37ae 100644
--- a/Project Undercover/Assets/Scripts/GuardCamera.cs	
+++ b/Project Undercover/Assets/Scripts/GuardCamera.cs	
@@ -6,6 +6,8 @@ public class GuardCamera : Photon.PunBehaviour {
 
     public float xRotation = 0.0f;
     public float yRotation = 0.0f;
+    public bool laserSightEnabled = false;
+    private GameObject line;
 
     void Start () {
         xRotation = transform.eulerAngles.y;
@@ -13,8 +15,25 @@ public class GuardCamera : Photon.PunBehaviour {
     }
 	
 	void Update () {
-        transform.localRotation = Quaternion.AngleAxis(xRotation, Vector3.up);
-        transform.localRotation *= Quaternion.AngleAxis(-yRotation, -Vector3.right);
+        Quaternion newRotation = Quaternion.AngleAxis(xRotation, Vector3.up);
+        newRotation *= Quaternion.AngleAxis(-yRotation, -Vector3.right);
+        transform.localRotation = Quaternion.Slerp(transform.rotation, newRotation, Time.time * 0.01f);
+
+        if (laserSightEnabled)
+        {
+            if (line == null)
+                line = LineDrawer.MakeLine();
+            RaycastHit hit;
+            if (Physics.Raycast(transform.position, transform.forward, out hit))
+                LineDrawer.DrawLine(line, transform.position, hit.point);
+            else
+                LineDrawer.DrawLine(line, transform.position, transform.position + transform.forward * 20.0f);
+        }
+        else
+        {
+            if (line != null)
+                Destroy(line);
+        }
     }
 
     public void UpdateRotation()
@@ -28,4 +47,10 @@ public class GuardCamera : Photon.PunBehaviour {
         this.xRotation = xRotation;
         this.yRotation = yRotation;
     }
+
+    [PunRPC]
+    void SetEnabledRPC(bool enabled)
+    {
+        laserSightEnabled = enabled;
+    }
 }
diff --git a/Project Undercover/Assets/Scripts/GuardCameraController.cs b/Project Undercover/Assets/Scripts/GuardCameraController.cs
index e5c273b..e3eaf4b 100644
--- a/Project Undercover/Assets/Scripts/GuardCameraController.cs	
+++ b/Project Undercover/Assets/Scripts/GuardCameraController.cs	
@@ -47,11 +47,12 @@ public class GuardCameraController : Photon.PunBehaviour {
         SetCameraEnabled(this, false);
     }
 
-    public void SetCameraEnabled(GuardCameraController camera, bool enabled)
+    public void SetCameraEnabled(GuardCameraController gCamera, bool enabled)
     {
-        camera.GetComponent<Camera>().enabled = enabled;
-        camera.GetComponent<AudioListener>().enabled = enabled;
-        camera.enabled = enabled;
+        gCamera.GetComponent<Camera>().enabled = enabled;
+        gCamera.GetComponent<AudioListener>().enabled = enabled;
+        gCamera.enabled = enabled;
+        gCamera.photonView.RPC("SetEnabledRPC", PhotonTargets.Others, enabled);
     }
 
 	void Update () {
@@ -65,12 +66,12 @@ public class GuardCameraController : Photon.PunBehaviour {
 
             if (Physics.Raycast(ray, out hit, 100.0f))
             {
-                if (hit.transform.gameObject.tag == "NPC")
+                if (hit.transform.parent.gameObject.tag == "NPC")
                 {
                     var manager = GameObject.FindGameObjectWithTag("GameManager").GetComponent<GameManager>();
                     manager.photonView.RPC("ShowSpiesWinScreen", PhotonTargets.All);
                 }
-                else if (hit.transform.gameObject.tag == "Spy")
+                else if (hit.transform.parent.gameObject.tag == "Spy")
                 {
                     var manager = GameObject.FindGameObjectWithTag("GameManager").GetComponent<GameManager>();
                     manager.photonView.RPC("ShowGuardsWinScreen", PhotonTargets.All);
diff --git a/Project Undercover/Assets/Scripts/LineDrawer.cs b/Project Undercover/Assets/Scripts/LineDrawer.cs
new file mode 100644
index 0000000..38c7f1f
--- /dev/null
+++ b/Project Undercover/Assets/Scripts/LineDrawer.cs	
@@ -0,0 +1,31 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public static class LineDrawer
+{
+
+    public static GameObject MakeLine()
+    {
+        GameObject myLine = new GameObject();
+        myLine.name = "line";
+        myLine.AddComponent<LineRenderer>();
+        LineRenderer lr = myLine.GetComponent<LineRenderer>();
+        lr.material = new Material(Shader.Find("Particles/Alpha Blended Premultiply"));
+        lr.startColor = Color.red;
+        lr.endColor = Color.red;
+        lr.startWidth = 0.005f;
+        lr.endWidth = 0.005f;
+        return myLine;
+    }
+
+    public static void DrawLine(GameObject line, Vector3 start, Vector3 end)
+    {
+        GameObject myLine = line;
+        myLine.transform.position = start;
+        LineRenderer lr = myLine.GetComponent<LineRenderer>();
+        lr.enabled = true;
+        lr.SetPosition(0, start);
+        lr.SetPosition(1, end);
+    }
+}
\ No newline at end of file
diff --git a/Project Undercover/Assets/Scripts/LineDrawer.cs.meta b/Project Undercover/Assets/Scripts/LineDrawer.cs.meta
new file mode 100644
index 0000000..42e18fb
--- /dev/null
+++ b/Project Undercover/Assets/Scripts/LineDrawer.cs.meta	
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 4c35561cb3b0b8c41887e2d220314fc9
+timeCreated: 1505988452
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Project Undercover/Assets/Scripts/SimpleNPCBehavior.cs b/Project Undercover/Assets/Scripts/SimpleNPCBehavior.cs
index 09f9cde..33b0836 100644
--- a/Project Undercover/Assets/Scripts/SimpleNPCBehavior.cs	
+++ b/Project Undercover/Assets/Scripts/SimpleNPCBehavior.cs	
@@ -20,7 +20,6 @@ public class SimpleNPCBehavior : Photon.PunBehaviour
             photonView.RPC("TeleportToTarget", PhotonTargets.All, GetRandomLocation());
             photonView.RPC("SetColorRPC", PhotonTargets.All, new Vector3(Random.value, Random.value, Random.value));
         }
-        agent.destination = transform.position;
     }
 
 	void Update() 
@@ -46,7 +45,7 @@ public class SimpleNPCBehavior : Photon.PunBehaviour
 
     public static Vector3 GetRandomLocation()
     {
-        var randTarget = new Vector3(4.0f - (8.0f * Random.value), 0.5f, 4.0f - (8.0f * Random.value));
+        var randTarget = new Vector3(5.0f - (10.0f * Random.value), 1.0f, 5.0f - (10.0f * Random.value));
         NavMeshHit hit;
         if (NavMesh.SamplePosition(randTarget, out hit, 1.0f, NavMesh.AllAreas))
             return hit.position;
@@ -63,7 +62,7 @@ public class SimpleNPCBehavior : Photon.PunBehaviour
     [PunRPC]
     void TeleportToTarget(Vector3 target)
     {
-        transform.position = target;
+        agent.Warp(target);
         agent.destination = target;
     }
 
diff --git a/Project Undercover/Assets/Scripts/Spy.cs b/Project Undercover/Assets/Scripts/Spy.cs
index aed0427..fdfea49 100644
--- a/Project Undercover/Assets/Scripts/Spy.cs	
+++ b/Project Undercover/Assets/Scripts/Spy.cs	
@@ -16,7 +16,6 @@ public class Spy : Photon.PunBehaviour {
         if (shakingSpies == null)
             shakingSpies = new HashSet<Spy>();
         agent = GetComponent<NavMeshAgent>();
-        transform.Find("Body").GetComponent<Renderer>().material.color = Random.ColorHSV(0f, 1f, 1f, 1f, 0f, 1f);
         if (!GetComponent<PlayerController>().enabled && PersistantPlayerSettings.character == PersistantPlayerSettings.Character.Spy)
         {
             nameTag.SetActive(true);