diff --git a/panda.lua b/panda.lua
index 92e929f..732a5bc 100644
--- a/panda.lua
+++ b/panda.lua
@@ -30,7 +30,7 @@ mobs:register_mob("mobs_animal:panda", {
 	run_velocity = 1.5,
 	jump = false,
 	jump_height = 6,
-	follow = {"ethereal:bamboo", "bamboo:trunk"},
+	follow = {"ethereal:bamboo", "bamboo:trunk", "group:bamboo"},
 	view_range = 8,
 	drops = {
 		{name = "mobs:meat_raw", chance = 1, min = 1, max = 2}
@@ -58,14 +58,21 @@ mobs:register_mob("mobs_animal:panda", {
 	end
 })
 
--- where to spawn (ethereal bamboo biome only)
+-- where to spawn
 
-if core.get_modpath("ethereal") and not mobs.custom_spawn_animal then
+if not mobs.custom_spawn_animal then
+
+	local spawn_on = "default:dirt_with_rainforest_litter"
+
+	if core.get_modpath("ethereal") then
+		spawn_on = "ethereal:bamboo_dirt"
+	elseif core.get_modpath("everness") then
+		spawn_on = "everness:dirt_with_grass_1"
+	end
 
 	mobs:spawn({
 		name = "mobs_animal:panda",
-		nodes = {"ethereal:bamboo_dirt"},
-		neighbors = {"group:grass"},
+		nodes = {spawn_on},
 		min_light = 14,
 		interval = 60,
 		chance = 8000,
diff --git a/penguin.lua b/penguin.lua
index 099de55..5a72ed8 100644
--- a/penguin.lua
+++ b/penguin.lua
@@ -41,7 +41,8 @@ stepheight = 0.6,
 	floats = 0,
 	follow = {
 		"group:food_fish_raw", "mobs_fish:clownfish", "mobs_fish:tropical",
-		"mobs_fish:clownfish_set", "mobs_fish:tropical_set", "xocean:fish_edible"
+		"mobs_fish:clownfish_set", "mobs_fish:tropical_set", "xocean:fish_edible",
+		"group:fish"
 	},
 	view_range = 5,