diff --git a/include/user/stimulusBuffer.h b/include/user/stimulusBuffer.h
index 8a99088..c821b5d 100644
--- a/include/user/stimulusBuffer.h
+++ b/include/user/stimulusBuffer.h
@@ -18,18 +18,18 @@ class StimulusProducer;
  * StimulusBuffer manages a collection of stimulus frames and ring buffer.
  *
  * This buffer holds the actual frame storage and ring buffer for stimulus
- * data. It maintains a reference to the StimulusProducer that it owns.
+ * data. It maintains a reference to its parent StimulusProducer.
  */
 class StimulusBuffer
 {
 public:
 	explicit StimulusBuffer(
-		std::shared_ptr<StimulusProducer> &producer,
+		StimulusProducer& parent,
 		const std::shared_ptr<device::DeviceAttachmentSpec>
 			&deviceAttachmentSpec,
 		int histbuffMs,
 		const SpMcRingBuffer::InputEngineConstraints& ringBufferConstraints)
-	: producer(producer),
+	: parent(parent),
 	deviceAttachmentSpec(deviceAttachmentSpec),
 	histbuffMs(histbuffMs),
 	frames_(static_cast<size_t>(histbuffMs / CONFIG_STIMBUFF_FRAME_PERIOD_MS)),
@@ -48,7 +48,7 @@ public:
 	StimulusBuffer& operator=(StimulusBuffer&&) = default;
 
 public:
-	std::shared_ptr<StimulusProducer> producer;
+	StimulusProducer& parent;
 	std::shared_ptr<device::DeviceAttachmentSpec> deviceAttachmentSpec;
 	int histbuffMs;
 	std::vector<StimulusFrame> frames_;
diff --git a/stimBuffApis/livoxGen1/pcloudAmbienceStimulusBuffer.h b/stimBuffApis/livoxGen1/pcloudAmbienceStimulusBuffer.h
index 68bf94f..a45f887 100644
--- a/stimBuffApis/livoxGen1/pcloudAmbienceStimulusBuffer.h
+++ b/stimBuffApis/livoxGen1/pcloudAmbienceStimulusBuffer.h
@@ -18,12 +18,12 @@ class PcloudAmbienceStimulusBuffer
 {
 public:
 	explicit PcloudAmbienceStimulusBuffer(
-		std::shared_ptr<StimulusProducer>& producer,
+		StimulusProducer& parent,
 		const std::shared_ptr<device::DeviceAttachmentSpec>& deviceAttachmentSpec,
 		int histbuffMs,
 		const SpMcRingBuffer::InputEngineConstraints& ringBufferConstraints)
 	:	StimulusBuffer(
-			producer, deviceAttachmentSpec, histbuffMs, ringBufferConstraints)
+			parent, deviceAttachmentSpec, histbuffMs, ringBufferConstraints)
 	{}
 
 	~PcloudAmbienceStimulusBuffer() = default;
diff --git a/stimBuffApis/livoxGen1/pcloudIStimulusBuffer.h b/stimBuffApis/livoxGen1/pcloudIStimulusBuffer.h
index f827b54..65bd0c3 100644
--- a/stimBuffApis/livoxGen1/pcloudIStimulusBuffer.h
+++ b/stimBuffApis/livoxGen1/pcloudIStimulusBuffer.h
@@ -18,12 +18,12 @@ class PcloudIStimulusBuffer
 {
 public:
 	explicit PcloudIStimulusBuffer(
-		std::shared_ptr<StimulusProducer>& producer,
+		StimulusProducer& parent,
 		const std::shared_ptr<device::DeviceAttachmentSpec>& deviceAttachmentSpec,
 		int histbuffMs,
 		const SpMcRingBuffer::InputEngineConstraints& ringBufferConstraints)
 	:	StimulusBuffer(
-			producer, deviceAttachmentSpec, histbuffMs, ringBufferConstraints)
+			parent, deviceAttachmentSpec, histbuffMs, ringBufferConstraints)
 	{}
 
 	~PcloudIStimulusBuffer() = default;
diff --git a/stimBuffApis/livoxGen1/pcloudXyzStimulusBuffer.h b/stimBuffApis/livoxGen1/pcloudXyzStimulusBuffer.h
index 516cb65..5ce17ab 100644
--- a/stimBuffApis/livoxGen1/pcloudXyzStimulusBuffer.h
+++ b/stimBuffApis/livoxGen1/pcloudXyzStimulusBuffer.h
@@ -18,12 +18,12 @@ class PcloudXyzStimulusBuffer
 {
 public:
 	explicit PcloudXyzStimulusBuffer(
-		std::shared_ptr<StimulusProducer>& producer,
+		StimulusProducer& parent,
 		const std::shared_ptr<device::DeviceAttachmentSpec>& deviceAttachmentSpec,
 		int histbuffMs,
 		const SpMcRingBuffer::InputEngineConstraints& ringBufferConstraints)
 	:	StimulusBuffer(
-			producer, deviceAttachmentSpec, histbuffMs, ringBufferConstraints)
+			parent, deviceAttachmentSpec, histbuffMs, ringBufferConstraints)
 	{}
 
 	~PcloudXyzStimulusBuffer() = default;