diff --git a/scripts/server/business.js b/scripts/server/business.js
index e4e1fef6..5c23034b 100644
--- a/scripts/server/business.js
+++ b/scripts/server/business.js
@@ -1324,6 +1324,8 @@ function createBusinessEntrancePickup(businessId) {
 		getBusinessData(businessId).entrancePickup = createGamePickup(pickupModelId, getBusinessData(businessId).entrancePosition, getGameConfig().pickupTypes[getServerGame()].business);
 		setElementOnAllDimensions(getBusinessData(businessId).entrancePickup, false);
 		setElementDimension(getBusinessData(businessId).entrancePickup, getBusinessData(businessId).entranceDimension);
+		setElementStreamInDistance(getBusinessData(businessId).entrancePickup, getGlobalConfig().businessPickupStreamInDistance);
+		setElementStreamOutDistance(getBusinessData(businessId).entrancePickup, getGlobalConfig().businessPickupStreamOutDistance);
 		updateBusinessPickupLabelData(businessId);
 		addToWorld(getBusinessData(businessId).entrancePickup);
 	}
@@ -1346,11 +1348,8 @@ function createBusinessEntranceBlip(businessId) {
 		getBusinessData(businessId).entranceBlip = createGameBlip(getBusinessData(businessId).entrancePosition, blipModelId, 1, getColourByName("businessBlue"));
 		setElementOnAllDimensions(getBusinessData(businessId).entranceBlip, false);
 		setElementDimension(getBusinessData(businessId).entranceBlip, getBusinessData(businessId).entranceDimension);
-		//getBusinessData(businessId).entranceBlip.streamInDistance = 300;
-		//getBusinessData(businessId).entranceBlip.streamOutDistance = 350;
-		//getBusinessData(businessId).entranceBlip.interior = getBusinessData(businessId).entranceInterior;
-		//setEntityData(getBusinessData(businessId).entranceBlip, "vrr.owner.type", VRR_BLIP_BUSINESS_ENTRANCE, false);
-		//setEntityData(getBusinessData(businessId).entranceBlip, "vrr.owner.id", businessId, false);
+		setElementStreamInDistance(getBusinessData(businessId).entranceBlip, getGlobalConfig().businessBlipStreamInDistance);
+		setElementStreamOutDistance(getBusinessData(businessId).entranceBlip, getGlobalConfig().businessBlipStreamOutDistance);
 		addToWorld(getBusinessData(businessId).entranceBlip);
 	}
 }
@@ -1373,9 +1372,8 @@ function createBusinessExitPickup(businessId) {
 			getBusinessData(businessId).exitPickup = createGamePickup(pickupModelId, getBusinessData(businessId).exitPosition, getGameConfig().pickupTypes[getServerGame()].business);
 			setElementDimension(getBusinessData(businessId).exitPickup, getBusinessData(businessId).exitDimension);
 			setElementOnAllDimensions(getBusinessData(businessId).exitPickup, false);
-			//setEntityData(getBusinessData(businessId).entranceBlip, "vrr.owner.type", VRR_PICKUP_BUSINESS_EXIT, false);
-			//setEntityData(getBusinessData(businessId).entranceBlip, "vrr.owner.id", businessId, false);
-			//getBusinessData(businessId).exitPickup.interior = getBusinessData(businessId).exitInterior;
+			setElementStreamInDistance(getBusinessData(businessId).exitPickup, getGlobalConfig().businessPickupStreamInDistance);
+			setElementStreamOutDistance(getBusinessData(businessId).exitPickup, getGlobalConfig().businessPickupStreamOutDistance);
 			updateBusinessPickupLabelData(businessId);
 			addToWorld(getBusinessData(businessId).exitPickup);
 		}
@@ -1400,9 +1398,8 @@ function createBusinessExitBlip(businessId) {
 			getBusinessData(businessId).exitBlip = createGameBlip(getBusinessData(businessId).exitPosition, blipModelId, 1, getColourByName("businessBlue"));
 			setElementDimension(getBusinessData(businessId).exitBlip, getBusinessData(businessId).entranceDimension);
 			setElementOnAllDimensions(getBusinessData(businessId).exitBlip, false);
-			//getBusinessData(businessId).exitBlip.interior = getBusinessData(businessId).exitInterior;
-			//setEntityData(getBusinessData(businessId).exitBlip, "vrr.owner.type", VRR_BLIP_BUSINESS_EXIT, false);
-			//setEntityData(getBusinessData(businessId).exitBlip, "vrr.owner.id", businessId, false);
+			setElementStreamInDistance(getBusinessData(businessId).exitBlip, getGlobalConfig().businessBlipStreamInDistance);
+			setElementStreamOutDistance(getBusinessData(businessId).exitBlip, getGlobalConfig().businessBlipStreamOutDistance);
 			addToWorld(getBusinessData(businessId).exitBlip);
 		}
 	}
diff --git a/scripts/server/house.js b/scripts/server/house.js
index 0031955e..8ac3b0ff 100644
--- a/scripts/server/house.js
+++ b/scripts/server/house.js
@@ -861,6 +861,9 @@ function createHouseEntrancePickup(houseId) {
 		getHouseData(houseId).entrancePickup = createGamePickup(pickupModelId, getHouseData(houseId).entrancePosition, getGameConfig().pickupTypes[getServerGame()].house);
 		setElementOnAllDimensions(getHouseData(houseId).entrancePickup, false);
 		setElementDimension(getHouseData(houseId).entrancePickup, getHouseData(houseId).entranceDimension);
+		setElementStreamInDistance(getBusinessData(businessId).entrancePickup, getGlobalConfig().housePickupStreamInDistance);
+		setElementStreamOutDistance(getBusinessData(businessId).entrancePickup, getGlobalConfig().housePickupStreamOutDistance);
+
 		setEntityData(getHouseData(houseId).entrancePickup, "vrr.owner.type", VRR_PICKUP_HOUSE_ENTRANCE, false);
 		setEntityData(getHouseData(houseId).entrancePickup, "vrr.owner.id", houseId, false);
 		setEntityData(getHouseData(houseId).entrancePickup, "vrr.label.type", VRR_LABEL_HOUSE, true);
@@ -897,8 +900,8 @@ function createHouseEntranceBlip(houseId) {
 		getHouseData(houseId).entranceBlip = createGameBlip(getHouseData(houseId).entrancePosition, blipModelId, 1, getColourByName("houseGreen"));
 		setElementDimension(getHouseData(houseId).entranceBlip, getHouseData(houseId).entranceDimension);
 		setElementOnAllDimensions(getHouseData(houseId).entranceBlip, false);
-		//getHouseData(houseId).entranceBlip.streamInDistance = 300;
-		//getHouseData(houseId).entranceBlip.streamOutDistance = 350;
+		setElementStreamInDistance(getBusinessData(businessId).entranceBlip, getGlobalConfig().houseBlipStreamInDistance);
+		setElementStreamOutDistance(getBusinessData(businessId).entranceBlip, getGlobalConfig().houseBlipStreamOutDistance);
 		setEntityData(getHouseData(houseId).entranceBlip, "vrr.owner.type", VRR_BLIP_HOUSE_ENTRANCE, false);
 		setEntityData(getHouseData(houseId).entranceBlip, "vrr.owner.id", houseId, false);
 		addToWorld(getHouseData(houseId).entranceBlip);
@@ -923,6 +926,8 @@ function createHouseExitPickup(houseId) {
 			getHouseData(houseId).exitPickup = createGamePickup(pickupModelId, getHouseData(houseId).exitPosition, getGameConfig().pickupTypes[getServerGame()].house);
 			setElementDimension(getHouseData(houseId).exitPickup, getHouseData(houseId).exitDimension);
 			setElementOnAllDimensions(getHouseData(houseId).exitPickup, false);
+			setElementStreamInDistance(getBusinessData(businessId).exitPickup, getGlobalConfig().housePickupStreamInDistance);
+			setElementStreamOutDistance(getBusinessData(businessId).exitPickup, getGlobalConfig().housePickupStreamOutDistance);
 			setEntityData(getHouseData(houseId).exitPickup, "vrr.owner.type", VRR_PICKUP_HOUSE_EXIT, false);
 			setEntityData(getHouseData(houseId).exitPickup, "vrr.owner.id", houseId, false);
 			setEntityData(getHouseData(houseId).exitPickup, "vrr.label.type", VRR_LABEL_EXIT, true);
@@ -949,6 +954,8 @@ function createHouseExitBlip(houseId) {
 			getHouseData(houseId).exitBlip = createGameBlip(blipModelId, getHouseData(houseId).exitPosition, 1, getColourByName("houseGreen"));
 			setElementDimension(getHouseData(houseId).exitBlip, getHouseData(houseId).entranceDimension);
 			setElementOnAllDimensions(getHouseData(houseId).exitBlip, false);
+			setElementStreamInDistance(getBusinessData(businessId).exitBlip, getGlobalConfig().houseBlipStreamInDistance);
+			setElementStreamOutDistance(getBusinessData(businessId).exitBlip, getGlobalConfig().houseBlipStreamOutDistance);
 			setEntityData(getHouseData(houseId).exitBlip, "vrr.owner.type", VRR_BLIP_HOUSE_EXIT, false);
 			setEntityData(getHouseData(houseId).exitBlip, "vrr.owner.id", houseId, false);
 			addToWorld(getHouseData(houseId).exitBlip);