diff --git a/README.md b/README.md
index 8d7f6beb..71e7b134 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
   </h3>
 </div>
 
-Beet is Behavior Expressed as Entity Trees, using [bevy observers][bevy-observers] for control flow and messaging. The entity-based approach is very flexible, and allows for multiple behavior paradigms to be used together as needed.
+Beet is Behavior Expressed as Entity Trees, using [Observers][bevy-observers] for control flow and messaging. The entity-based approach is very flexible, and allows for multiple behavior paradigms to be used together as needed.
 
 Currently implemented paradigms:
 - [Behavior Trees](./examples/hello_world.rs)
diff --git a/crates/beet_core/src/steer/steer_actions/seek.rs b/crates/beet_core/src/steer/steer_actions/seek.rs
index ea7a6c59..ea209814 100644
--- a/crates/beet_core/src/steer/steer_actions/seek.rs
+++ b/crates/beet_core/src/steer/steer_actions/seek.rs
@@ -76,7 +76,7 @@ mod test {
 				SteerBundle::default().with_target(Vec3::new(1.0, 0., 0.)),
 			))
 			.with_children(|parent| {
-				parent.spawn((RootIsTargetAgent, Running, Seek));
+				parent.spawn((TargetAgent(parent.parent_entity()), Running, Seek));
 			})
 			.id();
 
diff --git a/crates/beet_core/src/steer/steer_actions/wander.rs b/crates/beet_core/src/steer/steer_actions/wander.rs
index 6a7ce977..55db8368 100644
--- a/crates/beet_core/src/steer/steer_actions/wander.rs
+++ b/crates/beet_core/src/steer/steer_actions/wander.rs
@@ -74,7 +74,11 @@ mod test {
 				SteerBundle::default(),
 			))
 			.with_children(|parent| {
-				parent.spawn((RootIsTargetAgent, Running, Wander::default()));
+				parent.spawn((
+					TargetAgent(parent.parent_entity()),
+					Running,
+					Wander::default(),
+				));
 			})
 			.id();
 
diff --git a/crates/beet_examples/src/scenes/avoid_obstacles.rs b/crates/beet_examples/src/scenes/avoid_obstacles.rs
index 6dea1d53..ba3407c0 100644
--- a/crates/beet_examples/src/scenes/avoid_obstacles.rs
+++ b/crates/beet_examples/src/scenes/avoid_obstacles.rs
@@ -16,14 +16,14 @@
 // 		.with_children(|parent| {
 // 			parent.spawn((
 // 				Name::new("Drive Forward"),
-// 				RootIsTargetAgent,
+// 				TargetAgent(agent.parent_entity()),
 // 				Score::Weight(0.5),
 // 				SetAgentOnRun(DualMotorValue::splat(MotorValue::forward_max())),
 // 			));
 
 // 			parent.spawn((
 // 				Name::new("Turn Right"),
-// 				RootIsTargetAgent,
+// 				TargetAgent(agent.parent_entity()),
 // 				Score::default(),
 // 				DepthSensorScorer::new(threshold_dist),
 // 				SetAgentOnRun(DualMotorValue::new(
diff --git a/crates/beet_examples/src/scenes/flock.rs b/crates/beet_examples/src/scenes/flock.rs
index 16c9d919..7d2ce9e8 100644
--- a/crates/beet_examples/src/scenes/flock.rs
+++ b/crates/beet_examples/src/scenes/flock.rs
@@ -26,7 +26,7 @@ pub fn flock(mut commands: Commands) {
 				agent.spawn((
 					RunOnSpawn,
 					ContinueRun::default(),
-					RootIsTargetAgent,
+					TargetAgent(agent.parent_entity()),
 					Separate::<GroupSteerAgent>::new(1.),
 					Align::<GroupSteerAgent>::new(1.),
 					Cohere::<GroupSteerAgent>::new(1.),