diff --git a/dGame/dBehaviors/ChangeOrientationBehavior.cpp b/dGame/dBehaviors/ChangeOrientationBehavior.cpp
index a60be62f..36a2e6a8 100644
--- a/dGame/dBehaviors/ChangeOrientationBehavior.cpp
+++ b/dGame/dBehaviors/ChangeOrientationBehavior.cpp
@@ -2,43 +2,35 @@
 #include "BehaviorBranchContext.h"
 #include "BehaviorContext.h"
 #include "EntityManager.h"
-#include "BaseCombatAIComponent.h"
-
-void ChangeOrientationBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
-}
 
 void ChangeOrientationBehavior::Calculate(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
-	if (!m_ToTarget) return; // TODO: Add the other arguments to this behavior
+	Entity* sourceEntity;
+	if (this->m_orientCaster) sourceEntity = EntityManager::Instance()->GetEntity(context->originator);
+	else sourceEntity = EntityManager::Instance()->GetEntity(branch.target);
+	if (!sourceEntity) return;
 
-	auto* self = EntityManager::Instance()->GetEntity(context->originator);
-	auto* other = EntityManager::Instance()->GetEntity(branch.target);
+	if (this->m_toTarget) {
+		Entity* destinationEntity;
+		if (this->m_orientCaster) destinationEntity = EntityManager::Instance()->GetEntity(branch.target);
+		else destinationEntity = EntityManager::Instance()->GetEntity(context->originator);
+		if (!destinationEntity) return;
 
-	if (self == nullptr || other == nullptr) return;
-
-	const auto source = self->GetPosition();
-	const auto destination = self->GetPosition();
-
-	if (m_OrientCaster) {
-		auto* baseCombatAIComponent = self->GetComponent<BaseCombatAIComponent>();
-
-		/*if (baseCombatAIComponent != nullptr)
-		{
-			baseCombatAIComponent->LookAt(destination);
-		}
-		else*/
-		{
-			self->SetRotation(NiQuaternion::LookAt(source, destination));
-		}
-
-		EntityManager::Instance()->SerializeEntity(self);
-	} else {
-		other->SetRotation(NiQuaternion::LookAt(destination, source));
-
-		EntityManager::Instance()->SerializeEntity(other);
-	}
+		sourceEntity->SetRotation(
+			NiQuaternion::LookAt(sourceEntity->GetPosition(), destinationEntity->GetPosition())
+		);
+	} else if (this->m_toAngle){
+		auto baseAngle = NiPoint3(0, 0, this->m_angle);
+		if (this->m_relative) baseAngle += sourceEntity->GetRotation().GetForwardVector();
+		sourceEntity->SetRotation(NiQuaternion::FromEulerAngles(baseAngle));
+	} else return;
+	EntityManager::Instance()->SerializeEntity(sourceEntity);
+	return;
 }
 
 void ChangeOrientationBehavior::Load() {
-	m_OrientCaster = GetBoolean("orient_caster");
-	m_ToTarget = GetBoolean("to_target");
+	this->m_orientCaster = GetBoolean("orient_caster", true);
+	this->m_toTarget = GetBoolean("to_target", false);
+	this->m_toAngle = GetBoolean("to_angle", false);
+	this->m_angle = GetFloat("angle", 0.0f);
+	this->m_relative = GetBoolean("relative", false);
 }
diff --git a/dGame/dBehaviors/ChangeOrientationBehavior.h b/dGame/dBehaviors/ChangeOrientationBehavior.h
index eb038ffb..22c92bb8 100644
--- a/dGame/dBehaviors/ChangeOrientationBehavior.h
+++ b/dGame/dBehaviors/ChangeOrientationBehavior.h
@@ -2,24 +2,15 @@
 
 #include "Behavior.h"
 
-#include <vector>
-
-class ChangeOrientationBehavior final : public Behavior
-{
+class ChangeOrientationBehavior final : public Behavior {
 public:
-	bool m_OrientCaster;
-	bool m_ToTarget;
-
-	/*
-	 * Inherited
-	 */
-
-	explicit ChangeOrientationBehavior(const uint32_t behaviorId) : Behavior(behaviorId) {
-	}
-
-	void Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) override;
-
+	explicit ChangeOrientationBehavior(const uint32_t behaviorId) : Behavior(behaviorId) {}
 	void Calculate(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) override;
-
 	void Load() override;
+private:
+	bool m_orientCaster;
+	bool m_toTarget;
+	bool m_toAngle;
+	float m_angle;
+	bool m_relative;
 };