diff --git a/Cargo.lock b/Cargo.lock
index c402ba1..72528b2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -517,7 +517,6 @@ dependencies = [
 [[package]]
 name = "bevy_bae"
 version = "0.0.2"
-source = "git+https://github.com/janhohenheim/bevy_bae.git#c6229955138f7c487135fadae18290cf5d68bc13"
 dependencies = [
  "bevy_app",
  "bevy_derive",
diff --git a/Cargo.toml b/Cargo.toml
index ceab1f1..7cbbe61 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2024"
 
 [dependencies]
 bevy = "0.17.2"
-bevy_bae = { git = "https://github.com/janhohenheim/bevy_bae.git"}
+bevy_bae = { path = "../bevy_bae"}
 rand = "0.9.2"
 bevy_mod_props = { version = "0.1", git = "https://github.com/NthTensor/trill" }
 
diff --git a/src/berries.rs b/src/berries.rs
index 31795dd..85cc528 100644
--- a/src/berries.rs
+++ b/src/berries.rs
@@ -16,21 +16,19 @@ pub fn spawn_berries(
     asset_server: Res<AssetServer>,
     mut new_berries: MessageWriter<NewBerry>,
 ) {
-    timer.set_duration(Duration::from_millis(10));
+    timer.set_duration(Duration::from_millis(50));
     timer.tick(time.delta());
     if timer.is_finished() {
-        for _ in 0..100 {
-            let new = commands
-                .spawn((
-                    Berry,
-                    Transform::from_translation(
-                        (rand::rng().random::<Vec2>() - Vec2::splat(0.5)).extend(0.0) * 1000.0,
-                    ),
-                    Sprite::from_image(asset_server.load("berry.png")),
-                ))
-                .id();
-            new_berries.write(NewBerry(new));
-            timer.reset();
-        }
+        let new = commands
+            .spawn((
+                Berry,
+                Transform::from_translation(
+                    (rand::rng().random::<Vec2>() - Vec2::splat(0.5)).extend(0.0) * 1000.0,
+                ),
+                Sprite::from_image(asset_server.load("berry.png")),
+            ))
+            .id();
+        new_berries.write(NewBerry(new));
+        timer.reset();
     }
 }
diff --git a/src/main.rs b/src/main.rs
index a3ba430..06e3de4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -36,7 +36,7 @@ fn main() {
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
     commands.spawn(Camera2d);
     let mut rng = rand::rng();
-    for _ in 1..2500 {
+    for _ in 1..100 {
         commands.spawn((
             Plan::new(),
             Sprite::from_image(asset_server.load("collector.png")),
@@ -85,22 +85,11 @@ fn find_closest_berry(
     OperatorStatus::Ongoing
 }
 
-fn first_berry(
-    In(input): In<OperatorInput>,
-    berries: Query<Entity, (With<Berry>, Without<TargetedBerry>)>,
-    mut commands: Commands,
-) -> OperatorStatus {
-    if let Some(berry) = berries.iter().next() {
-        commands.entity(input.entity).insert(TargetBerry(berry));
-        return OperatorStatus::Success;
-    }
-    OperatorStatus::Ongoing
-}
-
 fn go_to_berry(
     In(input): In<OperatorInput>,
     mut planners: Query<(&mut Transform, &TargetBerry), With<Plan>>,
     berries: Query<&Transform, (With<Berry>, Without<Plan>)>,
+    new_berries: Query<&Transform, (With<Berry>, Without<TargetedBerry>, Without<Plan>)>,
     time: Res<Time>,
     mut news: MessageReader<NewBerry>,
     mut commands: Commands,
@@ -111,7 +100,7 @@ fn go_to_berry(
 
     if let Ok(target) = berries.get(target_entity.0) {
         for new in news.read() {
-            let Ok(new_trans) = berries.get(new.0) else {
+            let Ok(new_trans) = new_berries.get(new.0) else {
                 continue;
             };