diff --git a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml b/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml
index c535f7226..c1c4e141e 100644
--- a/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml
+++ b/code/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml
@@ -260,62 +260,20 @@
 	
 	<PRIMITIVE CLASS_NAME="camera_animation_tree" TYPE="node" AUTO_INIT="true" DELETABLE="true" NUMBERIZE="false">
 		<PARAMETER NAME="name" TYPE="string" VISIBLE="true"/>
-		<DYNAMIC_CHILD CLASS_NAME="camera_animation_static"/>
-		<DYNAMIC_CHILD CLASS_NAME="camera_animation_go_to"/>
-		<DYNAMIC_CHILD CLASS_NAME="camera_animation_follow_entity"/>
-		<DYNAMIC_CHILD CLASS_NAME="camera_animation_turn_around"/>
-		<DYNAMIC_CHILD CLASS_NAME="camera_animation_return"/>
+		<DYNAMIC_CHILD CLASS_NAME="camera_animation_step"/>
 	</PRIMITIVE>
 	
-	<PRIMITIVE CLASS_NAME="camera_animation_static" TYPE="node" AUTO_INIT="true" DELETABLE="true" NUMBERIZE="false">
-		<PARAMETER NAME="name" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="look_at_position" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="text" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="duration" TYPE="string" VISIBLE="true"/>
-		
-		<DYNAMIC_CHILD CLASS_NAME="sound_trigger"/>
-		<DYNAMIC_CHILD CLASS_NAME="camera_modifier_shake"/>
-	</PRIMITIVE>
-	
-	<PRIMITIVE CLASS_NAME="camera_animation_return" TYPE="node" AUTO_INIT="true" DELETABLE="true" NUMBERIZE="false">
+	<PRIMITIVE CLASS_NAME="camera_animation_step" TYPE="node" AUTO_INIT="true" DELETABLE="true" NUMBERIZE="false">
 		<PARAMETER NAME="name" TYPE="string" VISIBLE="true"/>
+		<PARAMETER NAME="look_at_target" TYPE="string" VISIBLE="true"/>
+		<PARAMETER NAME="direction_transition_time" TYPE="string" VISIBLE="true"/>
+		<PARAMETER NAME="position_target" TYPE="string" VISIBLE="true"/>
+		<PARAMETER NAME="position_transition_time" TYPE="string" VISIBLE="true"/>
+		<PARAMETER NAME="distance_to" TYPE="string" VISIBLE="true"/>
+		<PARAMETER NAME="has_turn_around" TYPE="boolean" VISIBLE="true"/>
+		<PARAMETER NAME="turn_around_speed" TYPE="string" VISIBLE="true"/>
 		<PARAMETER NAME="duration" TYPE="string" VISIBLE="true"/>
-		
-		<DYNAMIC_CHILD CLASS_NAME="sound_trigger"/>
-		<DYNAMIC_CHILD CLASS_NAME="camera_modifier_shake"/>
-	</PRIMITIVE>
-	
-	<PRIMITIVE CLASS_NAME="camera_animation_go_to" TYPE="node" AUTO_INIT="true" DELETABLE="true" NUMBERIZE="false">
-		<PARAMETER NAME="name" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="look_at_position" TYPE="string" VISIBLE="true"/>
 		<PARAMETER NAME="text" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="duration" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="end_position" TYPE="string" VISIBLE="true"/>
-		
-		<DYNAMIC_CHILD CLASS_NAME="sound_trigger"/>
-		<DYNAMIC_CHILD CLASS_NAME="camera_modifier_shake"/>
-	</PRIMITIVE>
-	
-	<PRIMITIVE CLASS_NAME="camera_animation_follow_entity" TYPE="node" AUTO_INIT="true" DELETABLE="true" NUMBERIZE="false">
-		<PARAMETER NAME="name" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="look_at_position" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="text" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="duration" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="entity_to_follow" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="distance_to_entity" TYPE="string" VISIBLE="true"/>
-		
-		<DYNAMIC_CHILD CLASS_NAME="sound_trigger"/>
-		<DYNAMIC_CHILD CLASS_NAME="camera_modifier_shake"/>
-	</PRIMITIVE>
-	
-	<PRIMITIVE CLASS_NAME="camera_animation_turn_around" TYPE="node" AUTO_INIT="true" DELETABLE="true" NUMBERIZE="false">
-		<PARAMETER NAME="name" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="look_at_position" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="text" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="duration" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="point_to_turn_around" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="distance_to_point" TYPE="string" VISIBLE="true"/>
-		<PARAMETER NAME="speed" TYPE="string" VISIBLE="true"/>
 		
 		<DYNAMIC_CHILD CLASS_NAME="sound_trigger"/>
 		<DYNAMIC_CHILD CLASS_NAME="camera_modifier_shake"/>