diff --git a/common/camera.cpp b/common/camera.cpp
index 3da2b533..c7384f08 100644
--- a/common/camera.cpp
+++ b/common/camera.cpp
@@ -104,14 +104,11 @@ Camera::Camera(bool Simple)
 		mOrthoTarget = mTargetPosition;
 		mUpVector = lcVector3(-0.2357f, -0.2357f, 0.94281f);
 
-		ChangeKey(1, false, true, mPosition, LC_CK_EYE);
-		ChangeKey(1, false, true, mTargetPosition, LC_CK_TARGET);
-		ChangeKey(1, false, true, mUpVector, LC_CK_UP);
-		ChangeKey(1, true, true, mPosition, LC_CK_EYE);
-		ChangeKey(1, true, true, mTargetPosition, LC_CK_TARGET);
-		ChangeKey(1, true, true, mUpVector, LC_CK_UP);
+		ChangeKey(1, true, mPosition, LC_CK_EYE);
+		ChangeKey(1, true, mTargetPosition, LC_CK_TARGET);
+		ChangeKey(1, true, mUpVector, LC_CK_UP);
 
-		UpdatePosition(1, false);
+		UpdatePosition(1);
 	}
 }
 
@@ -132,14 +129,11 @@ Camera::Camera(float ex, float ey, float ez, float tx, float ty, float tz)
 
 	float eye[3] = { ex, ey, ez }, target[3] = { tx, ty, tz };
 
-	ChangeKey(1, false, true, eye, LC_CK_EYE);
-	ChangeKey(1, false, true, target, LC_CK_TARGET);
-	ChangeKey(1, false, true, UpVector, LC_CK_UP);
-	ChangeKey(1, true, true, eye, LC_CK_EYE);
-	ChangeKey(1, true, true, target, LC_CK_TARGET);
-	ChangeKey(1, true, true, UpVector, LC_CK_UP);
+	ChangeKey(1, true, eye, LC_CK_EYE);
+	ChangeKey(1, true, target, LC_CK_TARGET);
+	ChangeKey(1, true, UpVector, LC_CK_UP);
 
-	UpdatePosition(1, false);
+	UpdatePosition(1);
 }
 
 Camera::~Camera()
@@ -218,22 +212,19 @@ bool Camera::FileLoad(lcFile& file)
 		f[0] = (float)d[0];
 		f[1] = (float)d[1];
 		f[2] = (float)d[2];
-		ChangeKey(1, false, true, f, LC_CK_EYE);
-		ChangeKey(1, true, true, f, LC_CK_EYE);
+		ChangeKey(1, true, f, LC_CK_EYE);
 
 		file.ReadDoubles(d, 3);
 		f[0] = (float)d[0];
 		f[1] = (float)d[1];
 		f[2] = (float)d[2];
-		ChangeKey(1, false, true, f, LC_CK_TARGET);
-		ChangeKey(1, true, true, f, LC_CK_TARGET);
+		ChangeKey(1, true, f, LC_CK_TARGET);
 
 		file.ReadDoubles(d, 3);
 		f[0] = (float)d[0];
 		f[1] = (float)d[1];
 		f[2] = (float)d[2];
-		ChangeKey(1, false, true, f, LC_CK_UP);
-		ChangeKey(1, true, true, f, LC_CK_UP);
+		ChangeKey(1, true, f, LC_CK_UP);
 	}
 
 	if (version == 3)
@@ -257,20 +248,17 @@ bool Camera::FileLoad(lcFile& file)
 			f[0] = (float)eye[0];
 			f[1] = (float)eye[1];
 			f[2] = (float)eye[2];
-			ChangeKey(step, false, true, f, LC_CK_EYE);
-			ChangeKey(step, true, true, f, LC_CK_EYE);
+			ChangeKey(step, true, f, LC_CK_EYE);
 
 			f[0] = (float)target[0];
 			f[1] = (float)target[1];
 			f[2] = (float)target[2];
-			ChangeKey(step, false, true, f, LC_CK_TARGET);
-			ChangeKey(step, true, true, f, LC_CK_TARGET);
+			ChangeKey(step, true, f, LC_CK_TARGET);
 
 			f[0] = (float)up[0];
 			f[1] = (float)up[1];
 			f[2] = (float)up[2];
-			ChangeKey(step, false, true, f, LC_CK_UP);
-			ChangeKey(step, true, true, f, LC_CK_UP);
+			ChangeKey(step, true, f, LC_CK_UP);
 
 			file.ReadS32(); // snapshot
 			file.ReadS32(); // cam
@@ -300,7 +288,7 @@ bool Camera::FileLoad(lcFile& file)
 				file.ReadFloats(param, 3);
 				file.ReadU8(&type, 1);
 
-				ChangeKey(time, false, true, param, type);
+				ChangeKey(time, true, param, type);
 			}
 
 			n = file.ReadS32();
@@ -309,8 +297,6 @@ bool Camera::FileLoad(lcFile& file)
 				file.ReadU16(&time, 1);
 				file.ReadFloats(param, 3);
 				file.ReadU8(&type, 1);
-
-				ChangeKey(time, true, true, param, type);
 			}
 		}
 
@@ -367,7 +353,7 @@ void Camera::FileSave(lcFile& file) const
 /////////////////////////////////////////////////////////////////////////////
 // Camera operations
 
-void Camera::Move(unsigned short nTime, bool bAnimation, bool bAddKey, float dx, float dy, float dz)
+void Camera::Move(unsigned short nTime, bool bAddKey, float dx, float dy, float dz)
 {
 	lcVector3 MoveVec(dx, dy, dz);
 
@@ -377,7 +363,7 @@ void Camera::Move(unsigned short nTime, bool bAnimation, bool bAddKey, float dx,
 		lcAlign(mOrthoTarget, mPosition, mTargetPosition);
 
 		if (!IsSimple())
-			ChangeKey(nTime, bAnimation, bAddKey, mPosition, LC_CK_EYE);
+			ChangeKey(nTime, bAddKey, mPosition, LC_CK_EYE);
 	}
 
 	if (IsTargetSelected())
@@ -385,7 +371,7 @@ void Camera::Move(unsigned short nTime, bool bAnimation, bool bAddKey, float dx,
 		mTargetPosition += MoveVec;
 
 		if (!IsSimple())
-			ChangeKey(nTime, bAnimation, bAddKey, mTargetPosition, LC_CK_TARGET);
+			ChangeKey(nTime, bAddKey, mTargetPosition, LC_CK_TARGET);
 	}
 
 	// Fix the up vector
@@ -394,7 +380,7 @@ void Camera::Move(unsigned short nTime, bool bAnimation, bool bAddKey, float dx,
 	mUpVector = lcNormalize(lcCross(SideVector, FrontVector));
 
 	if (!IsSimple())
-		ChangeKey(nTime, bAnimation, bAddKey, mUpVector, LC_CK_UP);
+		ChangeKey(nTime, bAddKey, mUpVector, LC_CK_UP);
 }
 
 void Camera::Select(bool bSelecting, bool bFocus, bool bMultiple)
@@ -449,10 +435,10 @@ void Camera::SelectTarget(bool bSelecting, bool bFocus, bool bMultiple)
 	}
 }
 
-void Camera::UpdatePosition(unsigned short nTime, bool bAnimation)
+void Camera::UpdatePosition(unsigned short nTime)
 {
 	if (!IsSimple())
-		CalculateKeys(nTime, bAnimation);
+		CalculateKeys(nTime);
 
 	lcVector3 FrontVector(mPosition - mTargetPosition);
 	lcVector3 SideVector = lcCross(FrontVector, mUpVector);
@@ -671,7 +657,7 @@ void Camera::LoadProjection(const lcProjection& projection)
 	glLoadMatrixf(mWorldView);
 }
 
-void Camera::ZoomExtents(View* view, const lcVector3& Center, const lcVector3* Points, int NumPoints, unsigned short nTime, bool bAnimation, bool bAddKey)
+void Camera::ZoomExtents(View* view, const lcVector3& Center, const lcVector3* Points, int NumPoints, unsigned short nTime, bool bAddKey)
 {
 	int Viewport[4] = { 0, 0, view->mWidth, view->mHeight };
 
@@ -687,14 +673,14 @@ void Camera::ZoomExtents(View* view, const lcVector3& Center, const lcVector3* P
 
 	if (!IsSimple())
 	{
-		ChangeKey(nTime, bAnimation, bAddKey, mPosition, LC_CK_EYE);
-		ChangeKey(nTime, bAnimation, bAddKey, mTargetPosition, LC_CK_TARGET);
+		ChangeKey(nTime, bAddKey, mPosition, LC_CK_EYE);
+		ChangeKey(nTime, bAddKey, mTargetPosition, LC_CK_TARGET);
 	}
 
-	UpdatePosition(nTime, bAnimation);
+	UpdatePosition(nTime);
 }
 
-void Camera::ZoomRegion(View* view, float Left, float Right, float Bottom, float Top, unsigned short nTime, bool bAnimation, bool bAddKey)
+void Camera::ZoomRegion(View* view, float Left, float Right, float Bottom, float Top, unsigned short nTime, bool bAddKey)
 {
 	int Viewport[4] = { 0, 0, view->mWidth, view->mHeight };
 	float Aspect = (float)Viewport[2]/(float)Viewport[3];
@@ -731,14 +717,14 @@ void Camera::ZoomRegion(View* view, float Left, float Right, float Bottom, float
 	// Change the camera and redraw.
 	if (!IsSimple())
 	{
-		ChangeKey(nTime, bAnimation, bAddKey, mPosition, LC_CK_EYE);
-		ChangeKey(nTime, bAnimation, bAddKey, mTargetPosition, LC_CK_TARGET);
+		ChangeKey(nTime, bAddKey, mPosition, LC_CK_EYE);
+		ChangeKey(nTime, bAddKey, mTargetPosition, LC_CK_TARGET);
 	}
 
-	UpdatePosition(nTime, bAnimation);
+	UpdatePosition(nTime);
 }
 
-void Camera::DoZoom(int dy, int mouse, unsigned short nTime, bool bAnimation, bool bAddKey)
+void Camera::DoZoom(int dy, int mouse, unsigned short nTime, bool bAddKey)
 {
 	lcVector3 FrontVector(mPosition - mTargetPosition);
 	FrontVector.Normalize();
@@ -756,14 +742,14 @@ void Camera::DoZoom(int dy, int mouse, unsigned short nTime, bool bAnimation, bo
 
 	if (!IsSimple())
 	{
-		ChangeKey(nTime, bAnimation, bAddKey, mPosition, LC_CK_EYE);
-		ChangeKey(nTime, bAnimation, bAddKey, mTargetPosition, LC_CK_TARGET);
+		ChangeKey(nTime, bAddKey, mPosition, LC_CK_EYE);
+		ChangeKey(nTime, bAddKey, mTargetPosition, LC_CK_TARGET);
 	}
 
-	UpdatePosition(nTime, bAnimation);
+	UpdatePosition(nTime);
 }
 
-void Camera::DoPan(int dx, int dy, int mouse, unsigned short nTime, bool bAnimation, bool bAddKey)
+void Camera::DoPan(int dx, int dy, int mouse, unsigned short nTime, bool bAddKey)
 {
 	lcVector3 FrontVector(mPosition - mTargetPosition);
 	lcVector3 SideVector = lcNormalize(lcCross(FrontVector, mUpVector));
@@ -775,14 +761,14 @@ void Camera::DoPan(int dx, int dy, int mouse, unsigned short nTime, bool bAnimat
 
 	if (!IsSimple())
 	{
-		ChangeKey(nTime, bAnimation, bAddKey, mPosition, LC_CK_EYE);
-		ChangeKey(nTime, bAnimation, bAddKey, mTargetPosition, LC_CK_TARGET);
+		ChangeKey(nTime, bAddKey, mPosition, LC_CK_EYE);
+		ChangeKey(nTime, bAddKey, mTargetPosition, LC_CK_TARGET);
 	}
 
-	UpdatePosition(nTime, bAnimation);
+	UpdatePosition(nTime);
 }
 
-void Camera::DoRotate(int dx, int dy, int mouse, unsigned short nTime, bool bAnimation, bool bAddKey, float* center)
+void Camera::DoRotate(int dx, int dy, int mouse, unsigned short nTime, bool bAddKey, float* center)
 {
 	lcVector3 FrontVector(mPosition - mTargetPosition);
 	lcVector3 CenterPosition(center[0], center[1], center[2]);
@@ -809,14 +795,14 @@ void Camera::DoRotate(int dx, int dy, int mouse, unsigned short nTime, bool bAni
 
 	if (!IsSimple())
 	{
-		ChangeKey(nTime, bAnimation, bAddKey, mPosition, LC_CK_EYE);
-		ChangeKey(nTime, bAnimation, bAddKey, mUpVector, LC_CK_UP);
+		ChangeKey(nTime, bAddKey, mPosition, LC_CK_EYE);
+		ChangeKey(nTime, bAddKey, mUpVector, LC_CK_UP);
 	}
 
-	UpdatePosition(nTime, bAnimation);
+	UpdatePosition(nTime);
 }
 
-void Camera::DoRoll(int dx, int mouse, unsigned short nTime, bool bAnimation, bool bAddKey)
+void Camera::DoRoll(int dx, int mouse, unsigned short nTime, bool bAddKey)
 {
 	lcVector3 FrontVector(mPosition - mTargetPosition);
 	lcMatrix44 Rotation = lcMatrix44FromAxisAngle(FrontVector, 2.0f * dx / (21 - mouse) * LC_DTOR);
@@ -824,25 +810,25 @@ void Camera::DoRoll(int dx, int mouse, unsigned short nTime, bool bAnimation, bo
 	mUpVector = lcMul30(mUpVector, Rotation);
 
 	if (!IsSimple())
-		ChangeKey(nTime, bAnimation, bAddKey, mUpVector, LC_CK_UP);
+		ChangeKey(nTime, bAddKey, mUpVector, LC_CK_UP);
 
-	UpdatePosition(nTime, bAnimation);
+	UpdatePosition(nTime);
 }
 
-void Camera::DoCenter(lcVector3& point, unsigned short nTime, bool bAnimation, bool bAddKey)
+void Camera::DoCenter(lcVector3& point, unsigned short nTime, bool bAddKey)
 {
 	lcAlign(mTargetPosition, mPosition, point);
 
 	if (!IsSimple())
 	{
-		ChangeKey(nTime, bAnimation, bAddKey, mPosition, LC_CK_EYE);
-		ChangeKey(nTime, bAnimation, bAddKey, mTargetPosition, LC_CK_TARGET);
+		ChangeKey(nTime, bAddKey, mPosition, LC_CK_EYE);
+		ChangeKey(nTime, bAddKey, mTargetPosition, LC_CK_TARGET);
 	}
 
-	UpdatePosition(nTime, bAnimation);
+	UpdatePosition(nTime);
 }
 
-void Camera::SetViewpoint(LC_VIEWPOINT Viewpoint, unsigned short nTime, bool bAnimation, bool bAddKey)
+void Camera::SetViewpoint(LC_VIEWPOINT Viewpoint, unsigned short nTime, bool bAddKey)
 {
 	lcVector3 Positions[] =
 	{
@@ -873,12 +859,12 @@ void Camera::SetViewpoint(LC_VIEWPOINT Viewpoint, unsigned short nTime, bool bAn
 
 	if (!IsSimple())
 	{
-		ChangeKey(nTime, bAnimation, bAddKey, mPosition, LC_CK_EYE);
-		ChangeKey(nTime, bAnimation, bAddKey, mTargetPosition, LC_CK_TARGET);
-		ChangeKey(nTime, bAnimation, bAddKey, mUpVector, LC_CK_UP);
+		ChangeKey(nTime, bAddKey, mPosition, LC_CK_EYE);
+		ChangeKey(nTime, bAddKey, mTargetPosition, LC_CK_TARGET);
+		ChangeKey(nTime, bAddKey, mUpVector, LC_CK_UP);
 	}
 
-	UpdatePosition(nTime, bAnimation);
+	UpdatePosition(nTime);
 }
 
 void Camera::StartTiledRendering(int tw, int th, int iw, int ih, float fAspect)
@@ -914,7 +900,7 @@ bool Camera::EndTile()
 	return false;
 }
 
-void Camera::SetFocalPoint(const lcVector3& focus, unsigned short nTime, bool bAnimation, bool bAddKey)
+void Camera::SetFocalPoint(const lcVector3& focus, unsigned short nTime, bool bAddKey)
 {
 	if (mProjection.GetType() == lcProjection::Ortho)
 	{
@@ -933,9 +919,9 @@ void Camera::SetFocalPoint(const lcVector3& focus, unsigned short nTime, bool bA
 
 	if (!IsSimple())
 	{
-		ChangeKey(nTime, bAnimation, bAddKey, mPosition, LC_CK_EYE);
-		ChangeKey(nTime, bAnimation, bAddKey, mTargetPosition, LC_CK_TARGET);
+		ChangeKey(nTime, bAddKey, mPosition, LC_CK_EYE);
+		ChangeKey(nTime, bAddKey, mTargetPosition, LC_CK_TARGET);
 	}
 
-	UpdatePosition(nTime, bAnimation);
+	UpdatePosition(nTime);
 }
diff --git a/common/camera.h b/common/camera.h
index e4587ae4..884f58fe 100644
--- a/common/camera.h
+++ b/common/camera.h
@@ -55,7 +55,7 @@ public:
 	virtual void MinIntersectDist(lcClickLine* ClickLine);
 	virtual bool IntersectsVolume(const lcVector4 Planes[6]) const;
 	void Select(bool bSelecting, bool bFocus, bool bMultiple);
-	void Move(unsigned short nTime, bool bAnimation, bool bAddKey, float x, float y, float z)
+	void Move(unsigned short nTime, bool bAddKey, float x, float y, float z)
 	{
 		// FIXME: move the position handling to the camera target
 	}
@@ -141,21 +141,21 @@ public:
 	void Select(bool bSelecting, bool bFocus, bool bMultiple);
 
 
-	void UpdatePosition(unsigned short nTime, bool bAnimation);
+	void UpdatePosition(unsigned short nTime);
 	void CopyPosition(const Camera* camera);
 	void Render(float fLineWidth);
 	void LoadProjection(const lcProjection& projection);
 
-	void ZoomExtents(View* view, const lcVector3& Center, const lcVector3* Points, int NumPoints, unsigned short nTime, bool bAnimation, bool bAddKey);
-	void ZoomRegion(View* view, float Left, float Right, float Bottom, float Top, unsigned short nTime, bool bAnimation, bool bAddKey);
-	void DoZoom(int dy, int mouse, unsigned short nTime, bool bAnimation, bool bAddKey);
-	void DoPan(int dx, int dy, int mouse, unsigned short nTime, bool bAnimation, bool bAddKey);
-	void DoRotate(int dx, int dy, int mouse, unsigned short nTime, bool bAnimation, bool bAddKey, float* center);
-	void DoRoll(int dx, int mouse, unsigned short nTime, bool bAnimation, bool bAddKey);
-	void DoCenter(lcVector3& point, unsigned short nTime, bool bAnimation, bool bAddKey);
-	void Move(unsigned short nTime, bool bAnimation, bool bAddKey, float x, float y, float z);
-	void SetViewpoint(LC_VIEWPOINT Viewpoint, unsigned short nTime, bool bAnimation, bool bAddKey);
-	void SetFocalPoint(const lcVector3& focus, unsigned short nTime, bool bAnimation, bool bAddKey);
+	void ZoomExtents(View* view, const lcVector3& Center, const lcVector3* Points, int NumPoints, unsigned short nTime, bool bAddKey);
+	void ZoomRegion(View* view, float Left, float Right, float Bottom, float Top, unsigned short nTime, bool bAddKey);
+	void DoZoom(int dy, int mouse, unsigned short nTime, bool bAddKey);
+	void DoPan(int dx, int dy, int mouse, unsigned short nTime, bool bAddKey);
+	void DoRotate(int dx, int dy, int mouse, unsigned short nTime, bool bAddKey, float* center);
+	void DoRoll(int dx, int mouse, unsigned short nTime, bool bAddKey);
+	void DoCenter(lcVector3& point, unsigned short nTime, bool bAddKey);
+	void Move(unsigned short nTime, bool bAddKey, float x, float y, float z);
+	void SetViewpoint(LC_VIEWPOINT Viewpoint, unsigned short nTime, bool bAddKey);
+	void SetFocalPoint(const lcVector3& focus, unsigned short nTime, bool bAddKey);
 
 	void StartTiledRendering(int tw, int th, int iw, int ih, float fAspect);
 	void GetTileInfo(int* row, int* col, int* width, int* height);
diff --git a/common/lc_application.cpp b/common/lc_application.cpp
index 9d864572..d879e19f 100644
--- a/common/lc_application.cpp
+++ b/common/lc_application.cpp
@@ -124,8 +124,6 @@ bool lcApplication::Initialize(int argc, char* argv[], const char* LibraryInstal
 
 	// Image output options.
 	bool SaveImage = false;
-	bool ImageAnimation = false;
-	bool ImageInstructions = false;
 	bool ImageHighlight = false;
 	int ImageWidth = lcGetProfileInt(LC_PROFILE_IMAGE_WIDTH);
 	int ImageHeight = lcGetProfileInt(LC_PROFILE_IMAGE_HEIGHT);
@@ -173,10 +171,6 @@ bool lcApplication::Initialize(int argc, char* argv[], const char* LibraryInstal
 			{
 				ParseIntegerArgument(&i, argc, argv, &ImageEnd);
 			}
-			else if (strcmp(Param, "--animation") == 0)
-				ImageAnimation = true;
-			else if (strcmp(Param, "--instructions") == 0)
-				ImageInstructions = true;
 			else if (strcmp(Param, "--highlight") == 0)
 				ImageHighlight = true;
 			else if ((strcmp(Param, "-v") == 0) || (strcmp(Param, "--version") == 0))
@@ -196,8 +190,6 @@ bool lcApplication::Initialize(int argc, char* argv[], const char* LibraryInstal
 				printf("  -h, --height <height>: Sets the picture height.\n");
 				printf("  -f, --from <time>: Sets the first frame or step to save pictures.\n");
 				printf("  -t, --to <time>: Sets the last frame or step to save pictures.\n");
-				printf("  --animation: Saves animations frames.\n");
-				printf("  --instructions: Saves instructions steps.\n");
 				printf("  --highlight: Highlight pieces in the steps they appear.\n");
 				printf("  \n");
 
@@ -293,11 +285,6 @@ bool lcApplication::Initialize(int argc, char* argv[], const char* LibraryInstal
 			}
 		}
 
-		if (ImageInstructions)
-			mProject->SetAnimation(false);
-		else if (ImageAnimation)
-			mProject->SetAnimation(true);
-
 		if (ImageEnd < ImageStart)
 			ImageEnd = ImageStart;
 		else if (ImageStart > ImageEnd)
@@ -316,22 +303,11 @@ bool lcApplication::Initialize(int argc, char* argv[], const char* LibraryInstal
 			ImageEnd = ImageStart;
 		}
 
-		if (mProject->IsAnimation())
-		{
-			if (ImageStart > mProject->GetTotalFrames())
-				ImageStart = mProject->GetTotalFrames();
+		if (ImageStart > 255)
+			ImageStart = 255;
 
-			if (ImageEnd > mProject->GetTotalFrames())
-				ImageEnd = mProject->GetTotalFrames();
-		}
-		else
-		{
-			if (ImageStart > 255)
-				ImageStart = 255;
-
-			if (ImageEnd > 255)
-				ImageEnd = 255;
-		}
+		if (ImageEnd > 255)
+			ImageEnd = 255;
 
 		Image* images = new Image[ImageEnd - ImageStart + 1];
 		mProject->CreateImages(images, ImageWidth, ImageHeight, ImageStart, ImageEnd, ImageHighlight);
diff --git a/common/lc_commands.cpp b/common/lc_commands.cpp
index 8ce5bc5f..d8a865bc 100644
--- a/common/lc_commands.cpp
+++ b/common/lc_commands.cpp
@@ -914,20 +914,6 @@ lcCommand gCommands[LC_NUM_COMMANDS] =
 		"Go to the last step of the model",
 		"Alt+Down"
 	},
-	// LC_VIEW_TIME_STOP
-	{
-		"View.Time.Stop",
-		"Stop",
-		"Stop playing animation",
-		""
-	},
-	// LC_VIEW_TIME_PLAY
-	{
-		"View.Time.Play",
-		"Play",
-		"Play animation",
-		""
-	},
 	// LC_VIEW_TIME_INSERT
 	{
 		"View.Time.Insert",
@@ -942,13 +928,6 @@ lcCommand gCommands[LC_NUM_COMMANDS] =
 		"Delete current step",
 		""
 	},
-	// LC_VIEW_TIME_ANIMATION
-	{
-		"View.Time.Animation",
-		"Animation",
-		"Toggle between animation and instruction mode",
-		""
-	},
 	// LC_VIEW_TIME_ADD_KEYS
 	{
 		"View.Time.AddKeys",
diff --git a/common/lc_commands.h b/common/lc_commands.h
index 76fdf5df..89fd2e5f 100644
--- a/common/lc_commands.h
+++ b/common/lc_commands.h
@@ -139,11 +139,8 @@ enum LC_COMMANDS
 	LC_VIEW_TIME_PREVIOUS,
 	LC_VIEW_TIME_NEXT,
 	LC_VIEW_TIME_LAST,
-	LC_VIEW_TIME_STOP,
-	LC_VIEW_TIME_PLAY,
 	LC_VIEW_TIME_INSERT,
 	LC_VIEW_TIME_DELETE,
-	LC_VIEW_TIME_ANIMATION,
 	LC_VIEW_TIME_ADD_KEYS,
 	LC_VIEW_SPLIT_HORIZONTAL,
 	LC_VIEW_SPLIT_VERTICAL,
diff --git a/common/lc_mainwindow.h b/common/lc_mainwindow.h
index 162f4e99..39c59b2b 100644
--- a/common/lc_mainwindow.h
+++ b/common/lc_mainwindow.h
@@ -34,8 +34,8 @@ class lcMainWindow : public lcBaseWindow
 	void UpdateSelectedObjects(int Flags, int SelectedCount, Object* Focus);
 	void UpdateAction(int NewAction);
 	void UpdatePaste(bool Enabled);
-	void UpdateTime(bool Animation, int CurrentTime, int TotalTime);
-	void UpdateAnimation(bool Animation, bool AddKeys);
+	void UpdateTime(int CurrentTime, int TotalTime);
+	void UpdateAnimation(bool AddKeys);
 	void UpdateLockSnap(lcuint32 Snap);
 	void UpdateSnap();
 	void UpdateUndoRedo(const char* UndoText, const char* RedoText);
diff --git a/common/light.cpp b/common/light.cpp
index 893cdcea..9a5f4a2a 100644
--- a/common/light.cpp
+++ b/common/light.cpp
@@ -79,12 +79,10 @@ Light::Light(float px, float py, float pz)
 
 	float pos[] = { px, py, pz }, target[] = { 0, 0, 0 };
 
-	ChangeKey(1, false, true, pos, LC_LK_POSITION);
-	ChangeKey(1, false, true, target, LC_LK_TARGET);
-	ChangeKey(1, true, true, pos, LC_LK_POSITION);
-	ChangeKey(1, true, true, target, LC_LK_TARGET);
+	ChangeKey(1, true, pos, LC_LK_POSITION);
+	ChangeKey(1, true, target, LC_LK_TARGET);
 
-	UpdatePosition(1, false);
+	UpdatePosition(1);
 }
 
 // New directional or spot light.
@@ -95,14 +93,12 @@ Light::Light(float px, float py, float pz, float tx, float ty, float tz)
 
 	float pos[] = { px, py, pz }, target[] = { tx, ty, tz };
 
-	ChangeKey(1, false, true, pos, LC_LK_POSITION);
-	ChangeKey(1, false, true, target, LC_LK_TARGET);
-	ChangeKey(1, true, true, pos, LC_LK_POSITION);
-	ChangeKey(1, true, true, target, LC_LK_TARGET);
+	ChangeKey(1, true, pos, LC_LK_POSITION);
+	ChangeKey(1, true, target, LC_LK_TARGET);
 
 	m_pTarget = new LightTarget(this);
 
-	UpdatePosition(1, false);
+	UpdatePosition(1);
 }
 
 void Light::Initialize()
@@ -125,22 +121,14 @@ void Light::Initialize()
 	float ambient[] = { 0, 0, 0 }, diffuse[] = { 0.8f, 0.8f, 0.8f }, specular[] = { 1, 1, 1 };
 	float constant = 1, linear = 0, quadratic = 0, cutoff = 30, exponent = 0;
 
-	ChangeKey(1, false, true, ambient, LC_LK_AMBIENT_COLOR);
-	ChangeKey(1, false, true, diffuse, LC_LK_DIFFUSE_COLOR);
-	ChangeKey(1, false, true, specular, LC_LK_SPECULAR_COLOR);
-	ChangeKey(1, false, true, &constant, LC_LK_CONSTANT_ATTENUATION);
-	ChangeKey(1, false, true, &linear, LC_LK_LINEAR_ATTENUATION);
-	ChangeKey(1, false, true, &quadratic, LC_LK_QUADRATIC_ATTENUATION);
-	ChangeKey(1, false, true, &cutoff, LC_LK_SPOT_CUTOFF);
-	ChangeKey(1, false, true, &exponent, LC_LK_SPOT_EXPONENT);
-	ChangeKey(1, true, true, ambient, LC_LK_AMBIENT_COLOR);
-	ChangeKey(1, true, true, diffuse, LC_LK_DIFFUSE_COLOR);
-	ChangeKey(1, true, true, specular, LC_LK_SPECULAR_COLOR);
-	ChangeKey(1, true, true, &constant, LC_LK_CONSTANT_ATTENUATION);
-	ChangeKey(1, true, true, &linear, LC_LK_LINEAR_ATTENUATION);
-	ChangeKey(1, true, true, &quadratic, LC_LK_QUADRATIC_ATTENUATION);
-	ChangeKey(1, true, true, &cutoff, LC_LK_SPOT_CUTOFF);
-	ChangeKey(1, true, true, &exponent, LC_LK_SPOT_EXPONENT);
+	ChangeKey(1, true, ambient, LC_LK_AMBIENT_COLOR);
+	ChangeKey(1, true, diffuse, LC_LK_DIFFUSE_COLOR);
+	ChangeKey(1, true, specular, LC_LK_SPECULAR_COLOR);
+	ChangeKey(1, true, &constant, LC_LK_CONSTANT_ATTENUATION);
+	ChangeKey(1, true, &linear, LC_LK_LINEAR_ATTENUATION);
+	ChangeKey(1, true, &quadratic, LC_LK_QUADRATIC_ATTENUATION);
+	ChangeKey(1, true, &cutoff, LC_LK_SPOT_CUTOFF);
+	ChangeKey(1, true, &exponent, LC_LK_SPOT_EXPONENT);
 }
 
 Light::~Light()
@@ -251,7 +239,7 @@ void Light::MinIntersectDist(lcClickLine* ClickLine)
 	}
 }
 
-void Light::Move(unsigned short nTime, bool bAnimation, bool bAddKey, float dx, float dy, float dz)
+void Light::Move(unsigned short nTime, bool bAddKey, float dx, float dy, float dz)
 {
 	lcVector3 MoveVec(dx, dy, dz);
 
@@ -259,20 +247,20 @@ void Light::Move(unsigned short nTime, bool bAnimation, bool bAddKey, float dx,
 	{
 		mPosition += MoveVec;
 
-		ChangeKey(nTime, bAnimation, bAddKey, mPosition, LC_LK_POSITION);
+		ChangeKey(nTime, bAddKey, mPosition, LC_LK_POSITION);
 	}
 
 	if (IsTargetSelected())
 	{
 		mTargetPosition += MoveVec;
 
-		ChangeKey(nTime, bAnimation, bAddKey, mTargetPosition, LC_LK_TARGET);
+		ChangeKey(nTime, bAddKey, mTargetPosition, LC_LK_TARGET);
 	}
 }
 
-void Light::UpdatePosition(unsigned short nTime, bool bAnimation)
+void Light::UpdatePosition(unsigned short nTime)
 {
-	CalculateKeys(nTime, bAnimation);
+	CalculateKeys(nTime);
 
 	if (m_pTarget != NULL)
 	{
diff --git a/common/light.h b/common/light.h
index 60275e92..6a9b8897 100644
--- a/common/light.h
+++ b/common/light.h
@@ -40,7 +40,7 @@ public:
 	virtual bool IntersectsVolume(const lcVector4 Planes[6]) const
 	{ return false; }
 	void Select (bool bSelecting, bool bFocus, bool bMultiple);
-	void Move (unsigned short nTime, bool bAnimation, bool bAddKey, float x, float y, float z)
+	void Move (unsigned short nTime, bool bAddKey, float x, float y, float z)
 	{
 		// FIXME: move the position handling to the light target
 	}
@@ -96,7 +96,7 @@ public:
 	{ return m_pTarget; }
 
 	const char* GetName() const
-	{ return m_strName; };
+	{ return m_strName; }
 
 	void Render(float fLineWidth);
 	void RenderCone();
@@ -106,8 +106,8 @@ public:
 	virtual void MinIntersectDist(lcClickLine* ClickLine);
 	virtual bool IntersectsVolume(const lcVector4 Planes[6]) const
 	{ return false; }
-	void UpdatePosition(unsigned short nTime, bool bAnimation);
-	void Move(unsigned short nTime, bool bAnimation, bool bAddKey, float dx, float dy, float dz);
+	void UpdatePosition(unsigned short nTime);
+	void Move(unsigned short nTime, bool bAddKey, float dx, float dy, float dz);
 	void Setup(int index);
 	void CreateName(const Light* pLight);
 
diff --git a/common/object.cpp b/common/object.cpp
index f08bdf77..63b8433d 100644
--- a/common/object.cpp
+++ b/common/object.cpp
@@ -18,7 +18,6 @@ Object::Object(LC_OBJECT_TYPE nType)
   //  m_nState = 0;
   //  m_strName[0] = '\0';
 
-  m_pAnimationKeys = NULL;
   m_pInstructionKeys = NULL;
 
   m_nObjectType = nType;
@@ -54,7 +53,7 @@ bool Object::FileLoad(lcFile& file)
     file.ReadFloats(param, 4);
     file.ReadU8(&type, 1);
 
-    ChangeKey(time, false, true, param, type);
+	ChangeKey(time, true, param, type);
   }
 
   file.ReadU32(&n, 1);
@@ -63,8 +62,6 @@ bool Object::FileLoad(lcFile& file)
     file.ReadU16(&time, 1);
     file.ReadFloats(param, 4);
     file.ReadU8(&type, 1);
-
-    ChangeKey(time, true, true, param, type);
   }
 
   return true;
@@ -88,16 +85,7 @@ void Object::FileSave(lcFile& file) const
     file.WriteU8(node->type);
   }
 
-  for (n = 0, node = m_pAnimationKeys; node; node = node->next)
-    n++;
-  file.WriteU32(n);
-
-  for (node = m_pAnimationKeys; node; node = node->next)
-  {
-    file.WriteU16(node->time);
-    file.WriteFloats(node->param, 4);
-    file.WriteU8(node->type);
-  }
+  file.WriteU32(0);
 }
 
 // =============================================================================
@@ -131,14 +119,10 @@ void Object::RegisterKeys(float *values[], LC_OBJECT_KEY_INFO* info, int count)
   for (i = 0; i < count; i++)
     m_pKeyValues[i] = values[i];
 
-  m_pAnimationKeys = AddNode(NULL, 1, 0);
   m_pInstructionKeys = AddNode(NULL, 1, 0);
 
   for (i = count-1; i > 0; i--)
-  {
-    AddNode(m_pAnimationKeys, 1, i);
-    AddNode(m_pInstructionKeys, 1, i);
-  }
+	AddNode(m_pInstructionKeys, 1, i);
 
   m_pKeyInfo = info;
   m_nKeyInfoCount = count;
@@ -154,22 +138,12 @@ void Object::RemoveKeys()
     node = node->next;
     free(prev);
   }
-
-  for (node = m_pAnimationKeys; node;)
-  {
-    prev = node;
-    node = node->next;
-    free(prev);
-  }
 }
 
-void Object::ChangeKey(unsigned short nTime, bool bAnimation, bool bAddKey, const float *param, unsigned char nKeyType)
+void Object::ChangeKey(unsigned short nTime, bool bAddKey, const float *param, unsigned char nKeyType)
 {
   LC_OBJECT_KEY *node, *poskey = NULL, *newpos = NULL;
-  if (bAnimation)
-    node = m_pAnimationKeys;
-  else
-    node = m_pInstructionKeys;
+  node = m_pInstructionKeys;
 
   while (node)
   {
@@ -198,7 +172,7 @@ void Object::ChangeKey(unsigned short nTime, bool bAnimation, bool bAddKey, cons
     newpos->param[i] = param[i];
 }
 
-void Object::CalculateKeys(unsigned short nTime, bool bAnimation)
+void Object::CalculateKeys(unsigned short nTime)
 {
 //  LC_OBJECT_KEY *next[m_nKeyInfoCount], *prev[m_nKeyInfoCount], *node;
   LC_OBJECT_KEY *next[32], *prev[32], *node;
@@ -207,10 +181,7 @@ void Object::CalculateKeys(unsigned short nTime, bool bAnimation)
   for (i = 0; i < m_nKeyInfoCount; i++)
     next[i] = NULL;
 
-  if (bAnimation)
-    node = m_pAnimationKeys;
-  else
-    node = m_pInstructionKeys;
+  node = m_pInstructionKeys;
 
   // Get the previous and next keys for each variable
   while (node && empty)
@@ -234,29 +205,18 @@ void Object::CalculateKeys(unsigned short nTime, bool bAnimation)
   // TODO: USE KEY IN/OUT WEIGHTS
   for (i = 0; i < m_nKeyInfoCount; i++)
   {
-    LC_OBJECT_KEY *n = next[i], *p = prev[i];
+	LC_OBJECT_KEY *p = prev[i];
 
-    if (bAnimation && (n != NULL) && (p->time != nTime))
-    {
-      float t = (float)(nTime - p->time)/(n->time - p->time);
-
-      for (int j = 0; j < m_pKeyInfo[i].size; j++)
-        m_pKeyValues[i][j] = p->param[j] + (n->param[j] - p->param[j])*t;
-    }
-    else
-      for (int j = 0; j < m_pKeyInfo[i].size; j++)
-        m_pKeyValues[i][j] = p->param[j];
+	for (int j = 0; j < m_pKeyInfo[i].size; j++)
+	  m_pKeyValues[i][j] = p->param[j];
   }
 }
 
-void Object::CalculateSingleKey(unsigned short nTime, bool bAnimation, int keytype, float *value) const
+void Object::CalculateSingleKey(unsigned short nTime, int keytype, float *value) const
 {
-	LC_OBJECT_KEY *next = NULL, *prev = NULL, *node;
+	LC_OBJECT_KEY *prev = NULL, *node;
 
-	if (bAnimation)
-		node = m_pAnimationKeys;
-	else
-		node = m_pInstructionKeys;
+	node = m_pInstructionKeys;
 
 	while (node)
 	{
@@ -265,32 +225,17 @@ void Object::CalculateSingleKey(unsigned short nTime, bool bAnimation, int keyty
 			if (node->time <= nTime)
 				prev = node;
 			else
-			{
-				if (next == NULL)
-				{
-					next = node;
-					break;
-				}
-			}
+				break;
 		}
 
 		node = node->next;
 	}
 
-	// TODO: USE KEY IN/OUT WEIGHTS
-	if (bAnimation && (next != NULL) && (prev->time != nTime))
-	{
-		float t = (float)(nTime - prev->time)/(next->time - prev->time);
-
-		for (int j = 0; j < m_pKeyInfo[keytype].size; j++)
-			value[j] = prev->param[j] + (next->param[j] - prev->param[j])*t;
-	}
-	else
-		for (int j = 0; j < m_pKeyInfo[keytype].size; j++)
-			value[j] = prev->param[j];
+	for (int j = 0; j < m_pKeyInfo[keytype].size; j++)
+		value[j] = prev->param[j];
 }
 
-void Object::InsertTime(unsigned short start, bool animation, unsigned short time)
+void Object::InsertTime(unsigned short start, unsigned short time)
 {
   LC_OBJECT_KEY *node, *prev = NULL;
   unsigned short last;
@@ -300,16 +245,8 @@ void Object::InsertTime(unsigned short start, bool animation, unsigned short tim
   for (i = 0; i < m_nKeyInfoCount; i++)
     end[i] = false;
 
-  if (animation)
-  {
-    node = m_pAnimationKeys;
-    last = lcGetActiveProject()->GetTotalFrames();
-  }
-  else
-  {
-    node = m_pInstructionKeys;
-    last = 255;
-  }
+  node = m_pInstructionKeys;
+  last = 255;
 
   for (; node != NULL; prev = node, node = node->next)
   {
@@ -336,14 +273,11 @@ void Object::InsertTime(unsigned short start, bool animation, unsigned short tim
   }
 }
 
-void Object::RemoveTime(unsigned short start, bool animation, unsigned short time)
+void Object::RemoveTime(unsigned short start, unsigned short time)
 {
   LC_OBJECT_KEY *node, *prev = NULL;
 
-  if (animation)
-    node = m_pAnimationKeys;
-  else
-    node = m_pInstructionKeys;
+  node = m_pInstructionKeys;
 
   for (; node != NULL; prev = node, node = node->next)
   {
diff --git a/common/object.h b/common/object.h
index c288c888..9cb5cae2 100644
--- a/common/object.h
+++ b/common/object.h
@@ -56,7 +56,7 @@ public:
 
 public:
 	// Move the object.
-	virtual void Move(unsigned short nTime, bool bAnimation, bool bAddKey, float dx, float dy, float dz) = 0;
+	virtual void Move(unsigned short nTime, bool bAddKey, float dx, float dy, float dz) = 0;
 
 	// Check if the object intersects the ray.
 	virtual void MinIntersectDist(lcClickLine* ClickLine) = 0;
@@ -148,26 +148,25 @@ public:
 
   // Key handling stuff
  public:
-  void CalculateSingleKey(unsigned short nTime, bool bAnimation, int keytype, float *value) const;
-  void ChangeKey(unsigned short time, bool animation, bool addkey, const float *param, unsigned char keytype);
-  virtual void InsertTime(unsigned short start, bool animation, unsigned short time);
-  virtual void RemoveTime(unsigned short start, bool animation, unsigned short time);
+  void CalculateSingleKey(unsigned short nTime, int keytype, float *value) const;
+  void ChangeKey(unsigned short time, bool addkey, const float *param, unsigned char keytype);
+  virtual void InsertTime(unsigned short start, unsigned short time);
+  virtual void RemoveTime(unsigned short start, unsigned short time);
 
   int GetKeyTypeCount() const
     { return m_nKeyInfoCount; }
   const LC_OBJECT_KEY_INFO* GetKeyTypeInfo(int index) const
-    { return &m_pKeyInfo[index]; };
+	{ return &m_pKeyInfo[index]; }
   const float* GetKeyTypeValue(int index) const
-    { return m_pKeyValues[index]; };
+	{ return m_pKeyValues[index]; }
 
  protected:
   void RegisterKeys(float *values[], LC_OBJECT_KEY_INFO* info, int count);
-  void CalculateKeys(unsigned short nTime, bool bAnimation);
+  void CalculateKeys(unsigned short nTime);
 
  private:
   void RemoveKeys();
 
-  LC_OBJECT_KEY* m_pAnimationKeys;
   LC_OBJECT_KEY* m_pInstructionKeys;
   float **m_pKeyValues;
 
diff --git a/common/piece.cpp b/common/piece.cpp
index db0cec6f..25315f9b 100644
--- a/common/piece.cpp
+++ b/common/piece.cpp
@@ -37,7 +37,6 @@ Piece::Piece(PieceInfo* pPieceInfo)
 	mColorCode = 0;
 	m_nStepShow = 1;
 	m_nStepHide = 255;
-	m_nFrameHide = 65535;
 	memset(m_strName, 0, sizeof(m_strName));
 	m_pGroup = NULL;
 
@@ -48,10 +47,8 @@ Piece::Piece(PieceInfo* pPieceInfo)
 	RegisterKeys (values, piece_key_info, LC_PK_COUNT);
 
 	float pos[3] = { 0, 0, 0 }, rot[4] = { 0, 0, 1, 0 };
-	ChangeKey (1, false, true, pos, LC_PK_POSITION);
-	ChangeKey (1, false, true, rot, LC_PK_ROTATION);
-	ChangeKey (1, true, true, pos, LC_PK_POSITION);
-	ChangeKey (1, true, true, rot, LC_PK_ROTATION);
+	ChangeKey(1, true, pos, LC_PK_POSITION);
+	ChangeKey(1, true, rot, LC_PK_ROTATION);
 }
 
 Piece::~Piece()
@@ -100,7 +97,7 @@ bool Piece::FileLoad(lcFile& file)
         file.ReadU16(&time, 1);
         file.ReadU8(&type, 1);
 
-        ChangeKey (time, false, true, param, type);
+		ChangeKey(time, true, param, type);
       }
 
       file.ReadU32(&keys, 1);
@@ -109,8 +106,6 @@ bool Piece::FileLoad(lcFile& file)
         file.ReadFloats(param, 4);
         file.ReadU16(&time, 1);
         file.ReadU8(&type, 1);
-
-        ChangeKey (time, true, true, param, type);
       }
     }
     else
@@ -141,14 +136,12 @@ bool Piece::FileLoad(lcFile& file)
 			file.ReadU8(&b, 1);
 			time = b;
 
-			ChangeKey(1, false, true, ModelWorld.r[3], LC_PK_POSITION);
-			ChangeKey(1, true, true, ModelWorld.r[3], LC_PK_POSITION);
+			ChangeKey(1, true, ModelWorld.r[3], LC_PK_POSITION);
 
 			lcVector4 AxisAngle = lcMatrix44ToAxisAngle(ModelWorld);
 			AxisAngle[3] *= LC_RTOD;
 
-			ChangeKey(time, false, true, AxisAngle, LC_PK_ROTATION);
-			ChangeKey(time, true, true, AxisAngle, LC_PK_ROTATION);
+			ChangeKey(time, true, AxisAngle, LC_PK_ROTATION);
 
 			lcint32 bl;
 			file.ReadS32(&bl, 1);
@@ -163,14 +156,12 @@ bool Piece::FileLoad(lcFile& file)
 			lcMatrix44 ModelWorld = lcMatrix44Translation(Translation);
 			ModelWorld = lcMul(lcMatrix44RotationZ(Rotation[2] * LC_DTOR), lcMul(lcMatrix44RotationY(Rotation[1] * LC_DTOR), lcMul(lcMatrix44RotationX(Rotation[0] * LC_DTOR), ModelWorld)));
 
-			ChangeKey(1, false, true, ModelWorld.r[3], LC_PK_POSITION);
-			ChangeKey(1, true, true, ModelWorld.r[3], LC_PK_POSITION);
+			ChangeKey(1, true, ModelWorld.r[3], LC_PK_POSITION);
 
 			lcVector4 AxisAngle = lcMatrix44ToAxisAngle(ModelWorld);
 			AxisAngle[3] *= LC_RTOD;
-			ChangeKey(1, false, true, AxisAngle, LC_PK_ROTATION);
-			ChangeKey(1, true, true, AxisAngle, LC_PK_ROTATION);
-      }
+			ChangeKey(1, true, AxisAngle, LC_PK_ROTATION);
+	  }
     }
   }
 
@@ -211,8 +202,8 @@ bool Piece::FileLoad(lcFile& file)
 
   if (version > 5)
   {
-    file.ReadU16(&m_nFrameShow, 1);
-    file.ReadU16(&m_nFrameHide, 1);
+	file.ReadU16(); // m_nFrameShow
+	file.ReadU16(); // m_nFrameHide
 
     if (version > 7)
     {
@@ -238,9 +229,6 @@ bool Piece::FileLoad(lcFile& file)
   }
   else
   {
-    m_nFrameShow = 1;
-    m_nFrameHide = 65535;
-
     file.ReadU8(&ch, 1);
     if (ch == 0)
       m_pGroup = (Group*)-1;
@@ -265,8 +253,8 @@ void Piece::FileSave(lcFile& file) const
 	file.WriteU32(mColorCode);
 	file.WriteU8(m_nStepShow);
 	file.WriteU8(m_nStepHide);
-	file.WriteU16(m_nFrameShow);
-	file.WriteU16(m_nFrameHide);
+	file.WriteU16(1); // m_nFrameShow
+	file.WriteU16(100); // m_nFrameHide
 
 	// version 8
 	file.WriteU8(m_nState);
@@ -294,18 +282,15 @@ void Piece::FileSave(lcFile& file) const
 	file.WriteS32(i);
 }
 
-void Piece::Initialize(float x, float y, float z, unsigned char nStep, unsigned short nFrame)
+void Piece::Initialize(float x, float y, float z, unsigned char nStep)
 {
-	m_nFrameShow = nFrame;
 	m_nStepShow = nStep;
 
 	float pos[3] = { x, y, z }, rot[4] = { 0, 0, 1, 0 };
-	ChangeKey (1, false, true, pos, LC_PK_POSITION);
-	ChangeKey (1, false, true, rot, LC_PK_ROTATION);
-	ChangeKey (1, true, true, pos, LC_PK_POSITION);
-	ChangeKey (1, true, true, rot, LC_PK_ROTATION);
+	ChangeKey(1, true, pos, LC_PK_POSITION);
+	ChangeKey(1, true, rot, LC_PK_ROTATION);
 
-	UpdatePosition (1, false);
+	UpdatePosition(1);
 }
 
 void Piece::CreateName(Piece* pPiece)
@@ -339,62 +324,32 @@ void Piece::Select (bool bSelecting, bool bFocus, bool bMultiple)
   }
 }
 
-void Piece::InsertTime (unsigned short start, bool animation, unsigned short time)
+void Piece::InsertTime(unsigned short start, unsigned short time)
 {
-  if (animation)
-  {
-    if (m_nFrameShow >= start)
-      m_nFrameShow = lcMin(m_nFrameShow + time, lcGetActiveProject()->GetTotalFrames());
+	if (m_nStepShow >= start)
+		m_nStepShow = lcMin(m_nStepShow + time, 255);
 
-    if (m_nFrameHide >= start)
-      m_nFrameHide = lcMin(m_nFrameHide + time, lcGetActiveProject()->GetTotalFrames());
+	if (m_nStepHide >= start)
+		m_nStepHide = lcMin(m_nStepHide + time, 255);
 
-    if (m_nFrameShow > lcGetActiveProject()->GetCurrentTime())
-      Select (false, false, false);
-  }
-  else
-  {
-    if (m_nStepShow >= start)
-      m_nStepShow = lcMin(m_nStepShow + time, 255);
+	if (m_nStepShow > lcGetActiveProject()->GetCurrentTime())
+		Select (false, false, false);
 
-    if (m_nStepHide >= start)
-      m_nStepHide = lcMin(m_nStepHide + time, 255);
-
-    if (m_nStepShow > lcGetActiveProject()->GetCurrentTime ())
-      Select (false, false, false);
-  }
-
-  Object::InsertTime (start, animation, time);
+	Object::InsertTime(start, time);
 }
 
-void Piece::RemoveTime (unsigned short start, bool animation, unsigned short time)
+void Piece::RemoveTime (unsigned short start, unsigned short time)
 {
-  if (animation)
-  {
-    if (m_nFrameShow >= start)
-      m_nFrameShow = lcMax(m_nFrameShow - time, 1);
+	if (m_nStepShow >= start)
+		m_nStepShow = lcMax(m_nStepShow - time, 1);
 
-    if (m_nFrameHide == lcGetActiveProject()->GetTotalFrames())
-      m_nFrameHide = lcGetActiveProject()->GetTotalFrames();
-    else
-      m_nFrameHide = lcMax(m_nFrameHide - time, 1);
+	if (m_nStepHide != 255)
+		m_nStepHide = lcMax(m_nStepHide - time, 1);
 
-    if (m_nFrameHide < lcGetActiveProject()->GetCurrentTime())
-      Select (false, false, false);
-  }
-  else
-  {
-    if (m_nStepShow >= start)
-      m_nStepShow = lcMax(m_nStepShow - time, 1);
+	if (m_nStepHide < lcGetActiveProject()->GetCurrentTime())
+		Select (false, false, false);
 
-    if (m_nStepHide != 255)
-      m_nStepHide = lcMax(m_nStepHide - time, 1);
-
-    if (m_nStepHide < lcGetActiveProject()->GetCurrentTime())
-      Select (false, false, false);
-  }
-
-  Object::RemoveTime (start, animation, time);
+	Object::RemoveTime(start, time);
 }
 
 void Piece::MinIntersectDist(lcClickLine* ClickLine)
@@ -482,35 +437,28 @@ bool Piece::IntersectsVolume(const lcVector4 Planes[6]) const
 	return Hit;
 }
 
-void Piece::Move(unsigned short nTime, bool bAnimation, bool bAddKey, float dx, float dy, float dz)
+void Piece::Move(unsigned short nTime, bool bAddKey, float dx, float dy, float dz)
 {
 	mPosition[0] += dx;
 	mPosition[1] += dy;
 	mPosition[2] += dz;
 
-	ChangeKey(nTime, bAnimation, bAddKey, mPosition, LC_PK_POSITION);
+	ChangeKey(nTime, bAddKey, mPosition, LC_PK_POSITION);
 
 	mModelWorld.SetTranslation(mPosition);
 }
 
-bool Piece::IsVisible(unsigned short nTime, bool bAnimation)
+bool Piece::IsVisible(unsigned short nTime)
 {
 	if (m_nState & LC_PIECE_HIDDEN)
 		return false;
 
-	if (bAnimation)
-	{
-		if (m_nFrameShow > nTime) return false;
-		if (m_nFrameHide < nTime) return false;
-		return true;
-	}
-	else
-	{
-		if (m_nStepShow > nTime) return false;
-		if ((m_nStepHide == 255) || (m_nStepHide > nTime))
-			return true;
+	if (m_nStepShow > nTime)
 		return false;
-	}
+
+	if ((m_nStepHide == 255) || (m_nStepHide > nTime))
+		return true;
+	return false;
 }
 
 void Piece::CompareBoundingBox(float box[6])
@@ -563,12 +511,12 @@ void Piece::UnGroup(Group* pGroup)
 }
 
 // Recalculates current position and connections
-void Piece::UpdatePosition(unsigned short nTime, bool bAnimation)
+void Piece::UpdatePosition(unsigned short nTime)
 {
-	if (!IsVisible(nTime, bAnimation))
+	if (!IsVisible(nTime))
 		m_nState &= ~(LC_PIECE_SELECTED|LC_PIECE_FOCUSED);
 
-	CalculateKeys (nTime, bAnimation);
+	CalculateKeys(nTime);
 
 	mModelWorld = lcMatrix44FromAxisAngle(lcVector3(mRotation[0], mRotation[1], mRotation[2]), mRotation[3] * LC_DTOR);
 	mModelWorld.SetTranslation(mPosition);
diff --git a/common/piece.h b/common/piece.h
index a3268898..057dbee6 100644
--- a/common/piece.h
+++ b/common/piece.h
@@ -26,9 +26,9 @@ public:
 	Piece (PieceInfo* pPieceInfo);
 	~Piece ();
 
-	void Select (bool bSelecting, bool bFocus, bool bMultiple);
-	virtual void InsertTime (unsigned short start, bool animation, unsigned short time);
-	virtual void RemoveTime (unsigned short start, bool animation, unsigned short time);
+	void Select(bool bSelecting, bool bFocus, bool bMultiple);
+	virtual void InsertTime(unsigned short start, unsigned short time);
+	virtual void RemoveTime(unsigned short start, unsigned short time);
 	virtual bool IntersectsVolume(const lcVector4 Planes[6]) const;
 
 
@@ -52,16 +52,16 @@ public:
 	{ return m_strName; }
 
 	virtual void MinIntersectDist(lcClickLine* ClickLine);
-	bool IsVisible(unsigned short nTime, bool bAnimation);
-	void Initialize(float x, float y, float z, unsigned char nStep, unsigned short nFrame);
+	bool IsVisible(unsigned short nTime);
+	void Initialize(float x, float y, float z, unsigned char nStep);
 	void CreateName(Piece* pPiece);
 	void CompareBoundingBox(float box[6]);
 	void SetPieceInfo(PieceInfo* pPieceInfo);
 	bool FileLoad(lcFile& file);
 	void FileSave(lcFile& file) const;
 
-	void UpdatePosition(unsigned short nTime, bool bAnimation);
-	void Move(unsigned short nTime, bool bAnimation, bool bAddKey, float dx, float dy, float dz);
+	void UpdatePosition(unsigned short nTime);
+	void Move(unsigned short nTime, bool bAddKey, float dx, float dy, float dz);
 
 	void DoGroup(Group* pGroup);
 	void UnGroup(Group* pGroup);
@@ -82,14 +82,6 @@ public:
 		{ m_nStepHide = step; }
 	unsigned char GetStepHide()
 		{ return (unsigned char)m_nStepHide; }
-	void SetFrameShow(unsigned short frame)
-		{ m_nFrameShow = frame; }
-	unsigned short GetFrameShow()
-		{ return m_nFrameShow; }
-	void SetFrameHide(unsigned short frame)
-		{ m_nFrameHide = frame; }
-	unsigned short GetFrameHide()
-		{ return m_nFrameHide; }
 
 	void Render(bool bLighting, bool bEdges);
 	void RenderBox(bool bHilite, float fLineWidth);
@@ -120,8 +112,6 @@ protected:
 	// Atributes
 	Group* m_pGroup;
 
-	lcuint16 m_nFrameShow;
-	lcuint16 m_nFrameHide;
 	lcuint8 m_nStepShow;
 	lcuint8 m_nStepHide;
 
diff --git a/common/project.cpp b/common/project.cpp
index c78b9ede..416f00b6 100644
--- a/common/project.cpp
+++ b/common/project.cpp
@@ -89,17 +89,14 @@ void Project::UpdateInterface()
 	gMainWindow->UpdateFocusObject(GetFocusObject());
 	SetAction(m_nCurAction);
 	gMainWindow->UpdateTransformType(mTransformType);
-	gMainWindow->UpdateAnimation(m_bAnimation, m_bAddKeys);
+	gMainWindow->UpdateAnimation(m_bAddKeys);
 	gMainWindow->UpdateLockSnap(m_nSnap);
 	gMainWindow->UpdateSnap();
 	gMainWindow->UpdateCameraMenu(mCameras, m_ActiveView ? m_ActiveView->mCamera : NULL);
 	gMainWindow->UpdatePerspective(m_ActiveView);
 
 	UpdateSelection();
-	if (m_bAnimation)
-		gMainWindow->UpdateTime(m_bAnimation, m_nCurFrame, m_nTotalFrames);
-	else
-		gMainWindow->UpdateTime(m_bAnimation, m_nCurStep, 255);
+	gMainWindow->UpdateTime(m_nCurStep, 255);
 
 	for (int i = 0; i < m_ViewList.GetSize(); i++)
 	{
@@ -207,9 +204,8 @@ void Project::LoadDefaults(bool cameras)
 	// Default values
 	gMainWindow->SetColorIndex(lcGetColorIndex(4));
 	SetAction(LC_ACTION_SELECT);
-	m_bAnimation = false;
 	m_bAddKeys = false;
-	gMainWindow->UpdateAnimation(m_bAnimation, m_bAddKeys);
+	gMainWindow->UpdateAnimation(m_bAddKeys);
 	m_bUndoOriginal = true;
 	gMainWindow->UpdateUndoRedo(NULL, NULL);
 	m_nDetail = lcGetProfileInt(LC_PROFILE_DETAIL);
@@ -248,11 +244,8 @@ void Project::LoadDefaults(bool cameras)
 	m_fGradient2[0] = (float)((unsigned char) (rgb))/255;
 	m_fGradient2[1] = (float)((unsigned char) (((unsigned short) (rgb)) >> 8))/255;
 	m_fGradient2[2] = (float)((unsigned char) ((rgb) >> 16))/255;
-	m_nFPS = 24;
 	m_nCurStep = 1;
-	m_nCurFrame = 1;
-	m_nTotalFrames = 100;
-	gMainWindow->UpdateTime(false, 1, 255);
+	gMainWindow->UpdateTime(1, 255);
 	m_nScene = lcGetProfileInt(LC_PROFILE_DEFAULT_SCENE);
 	m_nSaveTimer = 0;
 	strcpy(m_strHeader, "");
@@ -330,11 +323,9 @@ bool Project::FileLoad(lcFile* file, bool bUndo, bool bMerge)
 		file->ReadDoubles(eye, 3);
 		file->ReadDoubles(target, 3);
 		float tmp[3] = { (float)eye[0], (float)eye[1], (float)eye[2] };
-		pCam->ChangeKey(1, false, false, tmp, LC_CK_EYE);
-		pCam->ChangeKey(1, true, false, tmp, LC_CK_EYE);
+		pCam->ChangeKey(1, false, tmp, LC_CK_EYE);
 		tmp[0] = (float)target[0]; tmp[1] = (float)target[1]; tmp[2] = (float)target[2];
-		pCam->ChangeKey(1, false, false, tmp, LC_CK_TARGET);
-		pCam->ChangeKey(1, true, false, tmp, LC_CK_TARGET);
+		pCam->ChangeKey(1, false, tmp, LC_CK_TARGET);
 
 		// Create up vector
 		lcVector3 UpVector(0, 0, 1), FrontVector((float)(eye[0] - target[0]), (float)(eye[1] - target[1]), (float)(eye[2] - target[2])), SideVector;
@@ -344,8 +335,7 @@ bool Project::FileLoad(lcFile* file, bool bUndo, bool bMerge)
 		else
 			SideVector = lcCross(FrontVector, UpVector);
 		UpVector = lcNormalize(lcCross(SideVector, FrontVector));
-		pCam->ChangeKey(1, false, false, UpVector, LC_CK_UP);
-		pCam->ChangeKey(1, true, false, UpVector, LC_CK_UP);
+		pCam->ChangeKey(1, false, UpVector, LC_CK_UP);
 	}
 
 	if (bMerge)
@@ -411,7 +401,7 @@ bool Project::FileLoad(lcFile* file, bool bUndo, bool bMerge)
 			PieceInfo* pInfo = Library->FindPiece(name, true);
 			Piece* pPiece = new Piece(pInfo);
 
-			pPiece->Initialize(pos[0], pos[1], pos[2], step, 1);
+			pPiece->Initialize(pos[0], pos[1], pos[2], step);
 			pPiece->SetColorCode(lcGetColorCodeFromOriginalColor(color));
 			pPiece->CreateName(m_pPieces);
 			AddPiece(pPiece);
@@ -420,8 +410,7 @@ bool Project::FileLoad(lcFile* file, bool bUndo, bool bMerge)
 			lcVector4 AxisAngle = lcMatrix44ToAxisAngle(ModelWorld);
 			AxisAngle[3] *= LC_RTOD;
 
-			pPiece->ChangeKey(1, false, false, AxisAngle, LC_PK_ROTATION);
-			pPiece->ChangeKey(1, true, false, AxisAngle, LC_PK_ROTATION);
+			pPiece->ChangeKey(1, false, AxisAngle, LC_PK_ROTATION);
 //			pPiece->SetGroup((Group*)group);
 			SystemPieceComboAdd(pInfo->m_strDescription);
 		}
@@ -668,21 +657,21 @@ bool Project::FileLoad(lcFile* file, bool bUndo, bool bMerge)
 
 			if (fv < 1.3f)
 			{
-				file->ReadS32(&i, 1); m_bAnimation = (i != 0);
+				file->ReadS32(&i, 1); //m_bAnimation = (i != 0);
 				file->ReadS32(&i, 1); m_bAddKeys = (i != 0);
-				file->ReadU8(&m_nFPS, 1);
-				file->ReadS32(&i, 1); m_nCurFrame = i;
-				file->ReadU16(&m_nTotalFrames, 1);
+				file->ReadU8(&ch, 1); // m_nFPS
+				file->ReadS32(&i, 1); // m_nCurFrame = i;
+				file->ReadU16(&sh, 1); // m_nTotalFrames
 				file->ReadS32(&i, 1); //m_nGridSize = i;
 				file->ReadS32(&i, 1); //m_nMoveSnap = i;
 			}
 			else
 			{
-				file->ReadU8(&ch, 1); m_bAnimation = (ch != 0);
+				file->ReadU8(&ch, 1); //m_bAnimation = (ch != 0);
 				file->ReadU8(&ch, 1); m_bAddKeys = (ch != 0);
-				file->ReadU8(&m_nFPS, 1);
-				file->ReadU16(&m_nCurFrame, 1);
-				file->ReadU16(&m_nTotalFrames, 1);
+				file->ReadU8(&ch, 1); // m_nFPS
+				file->ReadU16(&sh, 1); // m_nCurFrame
+				file->ReadU16(&sh, 1); // m_nTotalFrames
 				file->ReadU16(&sh, 1); // m_nGridSize = sh;
 				file->ReadU16(&sh, 1);
 				if (fv >= 1.4f)
@@ -741,15 +730,12 @@ bool Project::FileLoad(lcFile* file, bool bUndo, bool bMerge)
 	}
 
 	SetAction(action);
-	gMainWindow->UpdateAnimation(m_bAnimation, m_bAddKeys);
+	gMainWindow->UpdateAnimation(m_bAddKeys);
 	gMainWindow->UpdateLockSnap(m_nSnap);
 	gMainWindow->UpdateSnap();
 	gMainWindow->UpdateCameraMenu(mCameras, m_ActiveView ? m_ActiveView->mCamera : NULL);
 	UpdateSelection();
-	if (m_bAnimation)
-		gMainWindow->UpdateTime(m_bAnimation, m_nCurFrame, m_nTotalFrames);
-	else
-		gMainWindow->UpdateTime(m_bAnimation, m_nCurStep, 255);
+	gMainWindow->UpdateTime(m_nCurStep, 255);
 	UpdateAllViews ();
 
 	return true;
@@ -847,13 +833,16 @@ void Project::FileSave(lcFile* file, bool bUndo)
 	// 0.60 (1.0)
 	rgb = LC_FLOATRGB(m_fAmbient);
 	file->WriteU32(&rgb, 1);
-	ch = m_bAnimation;
+	ch = 0;//m_bAnimation;
 	file->WriteBuffer(&ch, 1);
 	ch = m_bAddKeys;
 	file->WriteU8(&ch, 1);
-	file->WriteU8 (&m_nFPS, 1);
-	file->WriteU16(&m_nCurFrame, 1);
-	file->WriteU16(&m_nTotalFrames, 1);
+	ch = 24; // m_nFPS
+	file->WriteU8(&ch, 1);
+	sh = 1; // m_nCurFrame
+	file->WriteU16(&sh, 1);
+	sh = 100; // m_nTotalFrames
+	file->WriteU16(&sh, 1);
 	file->WriteU16(0); // m_nGridSize
 	file->WriteU16(&m_nMoveSnap, 1);
 	// 0.62 (1.1)
@@ -1046,12 +1035,11 @@ void Project::FileReadLDraw(lcFile* file, const lcMatrix44& CurrentTransform, in
 				lcVector4 AxisAngle = lcMatrix44ToAxisAngle(Transform);
 				AxisAngle[3] *= LC_RTOD;
 
-				pPiece->Initialize(IncludeTransform[3].x / 25.0f, IncludeTransform[3].z / 25.0f, -IncludeTransform[3].y / 25.0f, *nStep, 1);
+				pPiece->Initialize(IncludeTransform[3].x / 25.0f, IncludeTransform[3].z / 25.0f, -IncludeTransform[3].y / 25.0f, *nStep);
 				pPiece->SetColorCode(ColorCode);
 				pPiece->CreateName(m_pPieces);
 				AddPiece(pPiece);
-				pPiece->ChangeKey(1, false, false, AxisAngle, LC_PK_ROTATION);
-				pPiece->ChangeKey(1, true, false, AxisAngle, LC_PK_ROTATION);
+				pPiece->ChangeKey(1, false, AxisAngle, LC_PK_ROTATION);
 				SystemPieceComboAdd(pInfo->m_strDescription);
 				(*nOk)++;
 			}
@@ -1106,12 +1094,11 @@ void Project::FileReadLDraw(lcFile* file, const lcMatrix44& CurrentTransform, in
 			lcVector4 AxisAngle = lcMatrix44ToAxisAngle(Transform);
 			AxisAngle[3] *= LC_RTOD;
 
-			pPiece->Initialize(IncludeTransform[3].x / 25.0f, IncludeTransform[3].z / 25.0f, -IncludeTransform[3].y / 25.0f, *nStep, 1);
+			pPiece->Initialize(IncludeTransform[3].x / 25.0f, IncludeTransform[3].z / 25.0f, -IncludeTransform[3].y / 25.0f, *nStep);
 			pPiece->SetColorCode(ColorCode);
 			pPiece->CreateName(m_pPieces);
 			AddPiece(pPiece);
-			pPiece->ChangeKey(1, false, false, AxisAngle, LC_PK_ROTATION);
-			pPiece->ChangeKey(1, true, false, AxisAngle, LC_PK_ROTATION);
+			pPiece->ChangeKey(1, false, AxisAngle, LC_PK_ROTATION);
 			SystemPieceComboAdd(Info->m_strDescription);
 			(*nOk)++;
 		}
@@ -1200,7 +1187,7 @@ bool Project::DoSave(const char* FileName)
 		{
 			for (pPiece = m_pPieces; pPiece; pPiece = pPiece->m_pNext)
 			{
-				if ((pPiece->IsVisible(i, false)) && (pPiece->GetStepShow() == i))
+				if ((pPiece->IsVisible(i)) && (pPiece->GetStepShow() == i))
 				{
 					const float* f = pPiece->mModelWorld;
 					sprintf (buf, " 1 %d %.2f %.2f %.2f %.2f %.2f %.2f %.2f %.2f %.2f %.2f %.2f %.2f %s.DAT\r\n",
@@ -1393,7 +1380,7 @@ bool Project::OnOpenDocument (const char* lpszPathName)
         FileReadLDraw(&file, mat, &ok, 16, &step, FileArray);
 
       m_nCurStep = step;
-      gMainWindow->UpdateTime(false, m_nCurStep, 255);
+	  gMainWindow->UpdateTime(m_nCurStep, 255);
 	  gMainWindow->UpdateFocusObject(GetFocusObject());
       UpdateSelection();
       CalculateStep();
@@ -1755,7 +1742,7 @@ void Project::RenderScenePieces(View* view)
 
 	for (Piece* pPiece = m_pPieces; pPiece; pPiece = pPiece->m_pNext)
 	{
-		if (!pPiece->IsVisible(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation))
+		if (!pPiece->IsVisible(m_nCurStep))
 			continue;
 
 		bool Translucent = lcIsColorTranslucent(pPiece->mColorIndex);
@@ -2044,7 +2031,7 @@ void Project::RenderSceneBoxes(View* view)
 	glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 
 	for (pPiece = m_pPieces; pPiece; pPiece = pPiece->m_pNext)
-		if (pPiece->IsVisible(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation))
+		if (pPiece->IsVisible(m_nCurStep))
 			pPiece->RenderBox(true, m_fLineWidth);
 
 	glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
@@ -2107,7 +2094,7 @@ void Project::RenderSceneObjects(View* view)
 			float bs[6] = { 10000, 10000, 10000, -10000, -10000, -10000 };
 
 			for (Piece* pPiece = m_pPieces; pPiece; pPiece = pPiece->m_pNext)
-				if (pPiece->IsVisible(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation))
+				if (pPiece->IsVisible(m_nCurStep))
 					pPiece->CompareBoundingBox(bs);
 
 			if (m_nCurAction == LC_ACTION_INSERT || mDropPiece)
@@ -3245,13 +3232,13 @@ void Project::CalculateStep()
 	Light* pLight;
 
 	for (pPiece = m_pPieces; pPiece; pPiece = pPiece->m_pNext)
-		pPiece->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+		pPiece->UpdatePosition(m_nCurStep);
 
 	for (int CameraIdx = 0; CameraIdx < mCameras.GetSize(); CameraIdx++)
-		mCameras[CameraIdx]->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+		mCameras[CameraIdx]->UpdatePosition(m_nCurStep);
 
 	for (pLight = m_pLights; pLight; pLight = pLight->m_pNext)
-		pLight->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+		pLight->UpdatePosition(m_nCurStep);
 }
 
 // Returns true if anything was removed (used by cut and del)
@@ -3494,7 +3481,7 @@ void Project::FindPiece(bool FindFirst, bool SearchForward)
 			if (Start->IsFocused())
 				break;
 
-		if (Start && !Start->IsVisible(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation))
+		if (Start && !Start->IsVisible(m_nCurStep))
 			Start = NULL;
 	}
 
@@ -3529,7 +3516,7 @@ void Project::FindPiece(bool FindFirst, bool SearchForward)
 		if (!Current)
 			continue;
 
-		if (!Current->IsVisible(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation))
+		if (!Current->IsVisible(m_nCurStep))
 			continue;
 
 		if ((!mSearchOptions.MatchInfo || Current->mPieceInfo == mSearchOptions.Info) &&
@@ -3541,8 +3528,7 @@ void Project::FindPiece(bool FindFirst, bool SearchForward)
 			if (TopGroup)
 			{
 				for (Piece* piece = m_pPieces; piece; piece = piece->m_pNext)
-					if ((piece->IsVisible(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation)) &&
-						(piece->GetTopGroup() == TopGroup))
+					if (piece->IsVisible(m_nCurStep) && (piece->GetTopGroup() == TopGroup))
 						piece->Select (true, false, false);
 			}
 
@@ -3563,7 +3549,7 @@ void Project::ZoomExtents(int FirstView, int LastView)
 	float bs[6] = { 10000, 10000, 10000, -10000, -10000, -10000 };
 
 	for (Piece* pPiece = m_pPieces; pPiece; pPiece = pPiece->m_pNext)
-		if (pPiece->IsVisible(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation))
+		if (pPiece->IsVisible(m_nCurStep))
 			pPiece->CompareBoundingBox(bs);
 
 	lcVector3 Center((bs[0] + bs[3]) / 2, (bs[1] + bs[4]) / 2, (bs[2] + bs[5]) / 2);
@@ -3584,7 +3570,7 @@ void Project::ZoomExtents(int FirstView, int LastView)
 	{
 		View* view = m_ViewList[vp];
 
-		view->mCamera->ZoomExtents(view, Center, Points, 8, m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys);
+		view->mCamera->ZoomExtents(view, Center, Points, 8, m_nCurStep, m_bAddKeys);
 	}
 
 	gMainWindow->UpdateFocusObject(GetFocusObject());
@@ -3632,7 +3618,7 @@ void Project::CreateImages(Image* images, int width, int height, unsigned short
 
 	unsigned short oldtime;
 	unsigned char* buf = (unsigned char*)malloc (width*height*3);
-	oldtime = m_bAnimation ? m_nCurFrame : m_nCurStep;
+	oldtime = m_nCurStep;
 
 	View view(this);
 	view.SetCamera(m_ActiveView->mCamera, false);
@@ -3646,17 +3632,13 @@ void Project::CreateImages(Image* images, int width, int height, unsigned short
 
 	for (int i = from; i <= to; i++)
 	{
-		if (m_bAnimation)
-			m_nCurFrame = i;
-		else
-			m_nCurStep = i;
+		m_nCurStep = i;
 
 		if (hilite)
 		{
 			for (Piece* pPiece = m_pPieces; pPiece; pPiece = pPiece->m_pNext)
 			{
-				if ((m_bAnimation && pPiece->GetFrameShow() == i) ||
-					(!m_bAnimation && pPiece->GetStepShow() == i))
+				if (pPiece->GetStepShow() == i)
 					pPiece->Select (true, false, false);
 				else
 					pPiece->Select (false, false, false);
@@ -3668,10 +3650,7 @@ void Project::CreateImages(Image* images, int width, int height, unsigned short
 		images[i-from].FromOpenGL (width, height);
 	}
 
-	if (m_bAnimation)
-		m_nCurFrame = oldtime;
-	else
-		m_nCurStep = (unsigned char)oldtime;
+	m_nCurStep = (unsigned char)oldtime;
 	CalculateStep();
 	free (buf);
 
@@ -4625,16 +4604,8 @@ void Project::HandleCommand(LC_COMMANDS id)
 				}
 			}
 
-			if (m_bAnimation)
-			{
-				Options.Start = 1;
-				Options.End = m_nTotalFrames;
-			}
-			else
-			{
-				Options.Start = m_nCurStep;
-				Options.End = m_nCurStep;
-			}
+			Options.Start = m_nCurStep;
+			Options.End = m_nCurStep;
 
 			if (!gMainWindow->DoDialog(LC_DIALOG_SAVE_IMAGE, &Options))
 				break;
@@ -4670,10 +4641,7 @@ void Project::HandleCommand(LC_COMMANDS id)
 				break;
 			}
 
-			if (m_bAnimation)
-				Options.End = lcMin(Options.End, m_nTotalFrames);
-			else
-				Options.End = lcMin(Options.End, 255);
+			Options.End = lcMin(Options.End, 255);
 			Options.Start = lcMax(1, Options.Start);
 
 			if (Options.Start > Options.End)
@@ -5604,7 +5572,6 @@ void Project::HandleCommand(LC_COMMANDS id)
 				pPiece = pPasted;
 				pPasted = pPasted->m_pNext;
 				pPiece->CreateName(m_pPieces);
-				pPiece->SetFrameShow(m_nCurFrame);
 				pPiece->SetStepShow(m_nCurStep);
 				AddPiece(pPiece);
 				pPiece->Select(true, false, false);
@@ -5697,7 +5664,7 @@ void Project::HandleCommand(LC_COMMANDS id)
 		{
 			Piece* pPiece;
 			for (pPiece = m_pPieces; pPiece; pPiece = pPiece->m_pNext)
-				if (pPiece->IsVisible(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation))
+				if (pPiece->IsVisible(m_nCurStep))
 					pPiece->Select(true, false, false);
 
 //	pFrame->UpdateInfo();
@@ -5717,7 +5684,7 @@ void Project::HandleCommand(LC_COMMANDS id)
 		{
 			Piece* pPiece;
 			for (pPiece = m_pPieces; pPiece; pPiece = pPiece->m_pNext)
-				if (pPiece->IsVisible(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation))
+				if (pPiece->IsVisible(m_nCurStep))
 				{
                                   if (pPiece->IsSelected())
                                     pPiece->Select(false, false, false);
@@ -5816,7 +5783,7 @@ void Project::HandleCommand(LC_COMMANDS id)
 		{
 			lcVector3 FocusVector;
 			GetSelectionCenter(FocusVector);
-			m_ActiveView->mCamera->SetFocalPoint(FocusVector, m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys);
+			m_ActiveView->mCamera->SetFocalPoint(FocusVector, m_nCurStep, m_bAddKeys);
 			UpdateAllViews();
 			break;
 		}
@@ -5839,14 +5806,13 @@ void Project::HandleCommand(LC_COMMANDS id)
 
 				GetPieceInsertPosition(pLast, Pos, Rot);
 
-				pPiece->Initialize(Pos[0], Pos[1], Pos[2], m_nCurStep, m_nCurFrame);
+				pPiece->Initialize(Pos[0], Pos[1], Pos[2], m_nCurStep);
 
-				pPiece->ChangeKey(m_nCurStep, false, false, Rot, LC_PK_ROTATION);
-				pPiece->ChangeKey(m_nCurFrame, true, false, Rot, LC_PK_ROTATION);
-				pPiece->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+				pPiece->ChangeKey(m_nCurStep, false, Rot, LC_PK_ROTATION);
+				pPiece->UpdatePosition(m_nCurStep);
 			}
 			else
-				pPiece->Initialize(0, 0, 0, m_nCurStep, m_nCurFrame);
+				pPiece->Initialize(0, 0, 0, m_nCurStep);
 
 			SelectAndFocusNone(false);
 			pPiece->SetColorIndex(gMainWindow->mColorIndex);
@@ -6008,15 +5974,14 @@ void Project::HandleCommand(LC_COMMANDS id)
 					lcVector4& Position = Minifig.Matrices[i][3];
 					lcVector4 Rotation = lcMatrix44ToAxisAngle(Minifig.Matrices[i]);
 					Rotation[3] *= LC_RTOD;
-					pPiece->Initialize(Position[0], Position[1], Position[2], m_nCurStep, m_nCurFrame);
+					pPiece->Initialize(Position[0], Position[1], Position[2], m_nCurStep);
 					pPiece->SetColorIndex(Minifig.Colors[i]);
 					pPiece->CreateName(m_pPieces);
 					AddPiece(pPiece);
 					pPiece->Select(true, false, false);
 
-					pPiece->ChangeKey(1, false, false, Rotation, LC_PK_ROTATION);
-					pPiece->ChangeKey(1, true, false, Rotation, LC_PK_ROTATION);
-					pPiece->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+					pPiece->ChangeKey(1, false, Rotation, LC_PK_ROTATION);
+					pPiece->UpdatePosition(m_nCurStep);
 
 					SystemPieceComboAdd(Minifig.Parts[i]->m_strDescription);
 				}
@@ -6063,17 +6028,17 @@ void Project::HandleCommand(LC_COMMANDS id)
 			for (pPiece = m_pPieces; pPiece; pPiece = pPiece->m_pNext)
 			{
 				if (pPiece->IsSelected())
-			{
+				{
 					pPiece->CompareBoundingBox(bs);
 					sel++;
 				}
 			}
 
 			if (!sel)
-				{
+			{
 				gMainWindow->DoMessageBox("No pieces selected.", LC_MB_OK | LC_MB_ICONINFORMATION);
-					break;
-				}
+				break;
+			}
 
 			lcArrayDialogOptions Options;
 
@@ -6086,10 +6051,10 @@ void Project::HandleCommand(LC_COMMANDS id)
 				break;
 
 			if (Options.Counts[0] * Options.Counts[1] * Options.Counts[2] < 2)
-				{
+			{
 				gMainWindow->DoMessageBox("Array only has 1 element or less, no pieces added.", LC_MB_OK | LC_MB_ICONINFORMATION);
 				break;
-				}
+			}
 
 			ConvertFromUserUnits(Options.Offsets[0]);
 			ConvertFromUserUnits(Options.Offsets[1]);
@@ -6110,68 +6075,67 @@ void Project::HandleCommand(LC_COMMANDS id)
 						lcVector3 RotationAngles = Options.Rotations[0] * Step1 + Options.Rotations[1] * Step2 + Options.Rotations[2] * Step3;
 						lcVector3 Offset = Options.Offsets[0] * Step1 + Options.Offsets[1] * Step2 + Options.Offsets[2] * Step3;
 
-				for (pPiece = m_pPieces; pPiece; pPiece = pPiece->m_pNext)
-				{
-					if (!pPiece->IsSelected())
-						continue;
-
-						if (sel == 1)
+						for (pPiece = m_pPieces; pPiece; pPiece = pPiece->m_pNext)
 						{
+							if (!pPiece->IsSelected())
+								continue;
+
+							if (sel == 1)
+							{
 								ModelWorld = lcMul(pPiece->mModelWorld, lcMatrix44RotationX(RotationAngles[0] * LC_DTOR));
 								ModelWorld = lcMul(ModelWorld, lcMatrix44RotationY(RotationAngles[1] * LC_DTOR));
 								ModelWorld = lcMul(ModelWorld, lcMatrix44RotationZ(RotationAngles[2] * LC_DTOR));
 
-							Position = pPiece->mPosition;
-						}
-						else
-						{
-							lcVector4 Center((bs[0] + bs[3]) / 2, (bs[1] + bs[4]) / 2, (bs[2] + bs[5]) / 2, 0.0f);
-							ModelWorld = pPiece->mModelWorld;
+								Position = pPiece->mPosition;
+							}
+							else
+							{
+								lcVector4 Center((bs[0] + bs[3]) / 2, (bs[1] + bs[4]) / 2, (bs[2] + bs[5]) / 2, 0.0f);
+								ModelWorld = pPiece->mModelWorld;
 
-							ModelWorld.r[3] -= Center;
+								ModelWorld.r[3] -= Center;
 								ModelWorld = lcMul(ModelWorld, lcMatrix44RotationX(RotationAngles[0] * LC_DTOR));
 								ModelWorld = lcMul(ModelWorld, lcMatrix44RotationY(RotationAngles[1] * LC_DTOR));
 								ModelWorld = lcMul(ModelWorld, lcMatrix44RotationZ(RotationAngles[2] * LC_DTOR));
-							ModelWorld.r[3] += Center;
+								ModelWorld.r[3] += Center;
 
-							Position = lcVector3(ModelWorld.r[3].x, ModelWorld.r[3].y, ModelWorld.r[3].z);
-						}
-
-						lcVector4 AxisAngle = lcMatrix44ToAxisAngle(ModelWorld);
-						AxisAngle[3] *= LC_RTOD;
-
-								if (pLast)
-								{
-									pLast->m_pNext = new Piece(pPiece->mPieceInfo);
-									pLast = pLast->m_pNext;
-								}
-								else
-									pLast = pFirst = new Piece(pPiece->mPieceInfo);
-
-							pLast->Initialize(Position[0] + Offset[0], Position[1] + Offset[1], Position[2] + Offset[2], m_nCurStep, m_nCurFrame);
-								pLast->SetColorIndex(pPiece->mColorIndex);
-								pLast->ChangeKey(1, false, false, AxisAngle, LC_PK_ROTATION);
-								pLast->ChangeKey(1, true, false, AxisAngle, LC_PK_ROTATION);
+								Position = lcVector3(ModelWorld.r[3].x, ModelWorld.r[3].y, ModelWorld.r[3].z);
 							}
+
+							lcVector4 AxisAngle = lcMatrix44ToAxisAngle(ModelWorld);
+							AxisAngle[3] *= LC_RTOD;
+
+							if (pLast)
+							{
+								pLast->m_pNext = new Piece(pPiece->mPieceInfo);
+								pLast = pLast->m_pNext;
+							}
+							else
+								pLast = pFirst = new Piece(pPiece->mPieceInfo);
+
+							pLast->Initialize(Position[0] + Offset[0], Position[1] + Offset[1], Position[2] + Offset[2], m_nCurStep);
+							pLast->SetColorIndex(pPiece->mColorIndex);
+							pLast->ChangeKey(1, false, AxisAngle, LC_PK_ROTATION);
 						}
 					}
 				}
+			}
 
-				while (pFirst)
-				{
-					pPiece = pFirst->m_pNext;
-					pFirst->CreateName(m_pPieces);
-					pFirst->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
-					AddPiece(pFirst);
-					pFirst = pPiece;
-				}
+			while (pFirst)
+			{
+				pPiece = pFirst->m_pNext;
+				pFirst->CreateName(m_pPieces);
+				pFirst->UpdatePosition(m_nCurStep);
+				AddPiece(pFirst);
+				pFirst = pPiece;
+			}
 
-				SelectAndFocusNone(true);
+			SelectAndFocusNone(true);
 //			gMainWindow->UpdateFocusObject(GetFocusObject());
-				UpdateSelection();
-				UpdateAllViews();
-				SetModifiedFlag(true);
-				CheckPoint("Array");
+			UpdateSelection();
+			UpdateAllViews();
+			SetModifiedFlag(true);
+			CheckPoint("Array");
 		} break;
 
 		case LC_PIECE_GROUP:
@@ -6393,23 +6357,11 @@ void Project::HandleCommand(LC_COMMANDS id)
 			for (Piece* pPiece = m_pPieces; pPiece; pPiece = pPiece->m_pNext)
 				if (pPiece->IsSelected())
 				{
-					if (m_bAnimation)
+					unsigned char t = pPiece->GetStepShow();
+					if (t > 1)
 					{
-						unsigned short t = pPiece->GetFrameShow();
-						if (t > 1)
-						{
-							redraw = true;
-							pPiece->SetFrameShow(t-1);
-						}
-					}
-					else
-					{
-						unsigned char t = pPiece->GetStepShow();
-						if (t > 1)
-						{
-							redraw = true;
-							pPiece->SetStepShow(t-1);
-						}
+						redraw = true;
+						pPiece->SetStepShow(t-1);
 					}
 				}
 
@@ -6428,29 +6380,14 @@ void Project::HandleCommand(LC_COMMANDS id)
 			for (Piece* pPiece = m_pPieces; pPiece; pPiece = pPiece->m_pNext)
 				if (pPiece->IsSelected())
 				{
-					if (m_bAnimation)
+					unsigned char t = pPiece->GetStepShow();
+					if (t < 255)
 					{
-						unsigned short t = pPiece->GetFrameShow();
-						if (t < m_nTotalFrames)
-						{
-							redraw = true;
-							pPiece->SetFrameShow(t+1);
+						redraw = true;
+						pPiece->SetStepShow(t+1);
 
-							if (pPiece->IsSelected () && t == m_nCurFrame)
-								pPiece->Select (false, false, false);
-						}
-					}
-					else
-					{
-						unsigned char t = pPiece->GetStepShow();
-						if (t < 255)
-						{
-							redraw = true;
-							pPiece->SetStepShow(t+1);
-
-							if (pPiece->IsSelected () && t == m_nCurStep)
-								pPiece->Select (false, false, false);
-						}
+						if (pPiece->IsSelected () && t == m_nCurStep)
+							pPiece->Select (false, false, false);
 					}
 				}
 
@@ -6618,117 +6555,84 @@ void Project::HandleCommand(LC_COMMANDS id)
 				Center = lcVector3((bs[0] + bs[3]) * 0.5f, (bs[1] + bs[4]) * 0.5f, (bs[2] + bs[5]) * 0.5f);
 			}
 
-			m_ActiveView->mCamera->DoCenter(Center, m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys);
+			m_ActiveView->mCamera->DoCenter(Center, m_nCurStep, m_bAddKeys);
 			UpdateAllViews();
 			break;
 		}
 
 		case LC_VIEW_TIME_NEXT:
 		{
-			if (m_bAnimation)
-				m_nCurFrame++;
-			else
-				m_nCurStep++;
+			m_nCurStep++;
 
 			CalculateStep();
 			UpdateSelection();
 			gMainWindow->UpdateFocusObject(GetFocusObject());
 			UpdateAllViews();
 
-			if (m_bAnimation)
-				gMainWindow->UpdateTime(m_bAnimation, m_nCurFrame, m_nTotalFrames);
-			else
-				gMainWindow->UpdateTime(m_bAnimation, m_nCurStep, 255);
+			gMainWindow->UpdateTime(m_nCurStep, 255);
 		} break;
 
 		case LC_VIEW_TIME_PREVIOUS:
 		{
-			if (m_bAnimation)
-				m_nCurFrame--;
-			else
-				m_nCurStep--;
+			m_nCurStep--;
 
 			CalculateStep();
 			UpdateSelection();
 			gMainWindow->UpdateFocusObject(GetFocusObject());
 			UpdateAllViews();
 
-			if (m_bAnimation)
-				gMainWindow->UpdateTime(m_bAnimation, m_nCurFrame, m_nTotalFrames);
-			else
-				gMainWindow->UpdateTime(m_bAnimation, m_nCurStep, 255);
+			gMainWindow->UpdateTime(m_nCurStep, 255);
 		} break;
 
 		case LC_VIEW_TIME_FIRST:
 		{
-			if (m_bAnimation)
-				m_nCurFrame = 1;
-			else
-				m_nCurStep = 1;
+			m_nCurStep = 1;
 
 			CalculateStep();
 			UpdateSelection();
 			gMainWindow->UpdateFocusObject(GetFocusObject());
 			UpdateAllViews();
 
-			if (m_bAnimation)
-				gMainWindow->UpdateTime(m_bAnimation, m_nCurFrame, m_nTotalFrames);
-			else
-				gMainWindow->UpdateTime(m_bAnimation, m_nCurStep, 255);
+			gMainWindow->UpdateTime(m_nCurStep, 255);
 		} break;
 
 		case LC_VIEW_TIME_LAST:
 		{
-			if (m_bAnimation)
-				m_nCurFrame = m_nTotalFrames;
-			else
-				m_nCurStep = GetLastStep ();
+			m_nCurStep = GetLastStep ();
 
 			CalculateStep();
 			UpdateSelection();
 			gMainWindow->UpdateFocusObject(GetFocusObject());
 			UpdateAllViews();
 
-			if (m_bAnimation)
-				gMainWindow->UpdateTime(m_bAnimation, m_nCurFrame, m_nTotalFrames);
-			else
-				gMainWindow->UpdateTime(m_bAnimation, m_nCurStep, 255);
+			gMainWindow->UpdateTime(m_nCurStep, 255);
 		} break;
 /*
 		case LC_VIEW_STEP_SET:
 		{
-			if (m_bAnimation)
-				m_nCurFrame = (nParam < m_nTotalFrames) ? (unsigned short)nParam : m_nTotalFrames;
-			else
-				m_nCurStep = (nParam < 255) ? (unsigned char)nParam : 255;
+			m_nCurStep = (nParam < 255) ? (unsigned char)nParam : 255;
 
 			CalculateStep();
 			UpdateSelection();
 			gMainWindow->UpdateFocusObject(GetFocusObject());
 			UpdateAllViews();
 
-			if (m_bAnimation)
-				gMainWindow->UpdateTime(m_bAnimation, m_nCurFrame, m_nTotalFrames);
-			else
-				gMainWindow->UpdateTime(m_bAnimation, m_nCurStep, 255);
+			gMainWindow->UpdateTime(m_bAnimation, m_nCurStep, 255);
 		} break;
 */
 		case LC_VIEW_TIME_INSERT:
 		{
 			for (Piece* pPiece = m_pPieces; pPiece; pPiece = pPiece->m_pNext)
-				pPiece->InsertTime(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, 1);
+				pPiece->InsertTime(m_nCurStep, 1);
 
 			for (int CameraIdx = 0; CameraIdx < mCameras.GetSize(); CameraIdx++)
-				mCameras[CameraIdx]->InsertTime(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, 1);
+				mCameras[CameraIdx]->InsertTime(m_nCurStep, 1);
 
 			for (Light* pLight = m_pLights; pLight; pLight = pLight->m_pNext)
-				pLight->InsertTime(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, 1);
+				pLight->InsertTime(m_nCurStep, 1);
 
 			SetModifiedFlag(true);
-			if (m_bAnimation)
-				CheckPoint("Adding Frame");
-			else
-				CheckPoint("Adding Step");
+			CheckPoint("Adding Step");
 			CalculateStep();
 			UpdateAllViews();
 			UpdateSelection();
@@ -6737,105 +6641,66 @@ void Project::HandleCommand(LC_COMMANDS id)
 		case LC_VIEW_TIME_DELETE:
 		{
 			for (Piece* pPiece = m_pPieces; pPiece; pPiece = pPiece->m_pNext)
-				pPiece->RemoveTime(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, 1);
+				pPiece->RemoveTime(m_nCurStep, 1);
 
 			for (int CameraIdx = 0; CameraIdx < mCameras.GetSize(); CameraIdx++)
-				mCameras[CameraIdx]->RemoveTime(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, 1);
+				mCameras[CameraIdx]->RemoveTime(m_nCurStep, 1);
 
 			for (Light* pLight = m_pLights; pLight; pLight = pLight->m_pNext)
-				pLight->RemoveTime(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, 1);
+				pLight->RemoveTime(m_nCurStep, 1);
 
 			SetModifiedFlag (true);
-			if (m_bAnimation)
-				CheckPoint("Removing Frame");
-			else
-				CheckPoint("Removing Step");
+			CheckPoint("Removing Step");
 			CalculateStep();
 			UpdateAllViews();
 			UpdateSelection();
 		} break;
 
-		case LC_VIEW_TIME_STOP:
-		{
-			m_bStopRender = true;
-		} break;
-
-		case LC_VIEW_TIME_PLAY:
-		{
-			// TODO: Rewrite animation playback by posting events, not looping here
-		/*
-			SelectAndFocusNone(false);
-			UpdateSelection();
-			m_bStopRender = false;
-			SystemUpdatePlay(false, true);
-			long time = SystemGetTicks();
-			unsigned short tics;
-			float rate = 1000.0f/m_nFPS;
-
-			while (!m_bStopRender)
-			{
-				tics = (unsigned short)(SystemGetTicks() - time);
-				if (tics < rate)
-					continue; // nothing to do
-
-				time = SystemGetTicks();
-				m_nCurFrame += (unsigned short)((float)tics/rate);
-				while (m_nCurFrame > m_nTotalFrames)
-					m_nCurFrame -= m_nTotalFrames;
-				CalculateStep();
-				gMainWindow->UpdateTime(true, m_nCurFrame, m_nTotalFrames);
-                UpdateAllViews();
-			}
-			SystemUpdatePlay(true, false);
-			gMainWindow->UpdateFocusObject(GetFocusObject());
-			*/
-		} break;
-
 		case LC_VIEW_VIEWPOINT_FRONT:
 		{
-			m_ActiveView->mCamera->SetViewpoint(LC_VIEWPOINT_FRONT, m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys);
+			m_ActiveView->mCamera->SetViewpoint(LC_VIEWPOINT_FRONT, m_nCurStep, m_bAddKeys);
 			HandleCommand(LC_VIEW_ZOOM_EXTENTS);
 			m_ActiveView->UpdateProjection();
 		} break;
 
 		case LC_VIEW_VIEWPOINT_BACK:
 		{
-			m_ActiveView->mCamera->SetViewpoint(LC_VIEWPOINT_BACK, m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys);
+			m_ActiveView->mCamera->SetViewpoint(LC_VIEWPOINT_BACK, m_nCurStep, m_bAddKeys);
 			HandleCommand(LC_VIEW_ZOOM_EXTENTS);
 			m_ActiveView->UpdateProjection();
 		} break;
 
 		case LC_VIEW_VIEWPOINT_TOP:
 		{
-			m_ActiveView->mCamera->SetViewpoint(LC_VIEWPOINT_TOP, m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys);
+			m_ActiveView->mCamera->SetViewpoint(LC_VIEWPOINT_TOP, m_nCurStep, m_bAddKeys);
 			HandleCommand(LC_VIEW_ZOOM_EXTENTS);
 			m_ActiveView->UpdateProjection();
 		} break;
 
 		case LC_VIEW_VIEWPOINT_BOTTOM:
 		{
-			m_ActiveView->mCamera->SetViewpoint(LC_VIEWPOINT_BOTTOM, m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys);
+			m_ActiveView->mCamera->SetViewpoint(LC_VIEWPOINT_BOTTOM, m_nCurStep, m_bAddKeys);
 			HandleCommand(LC_VIEW_ZOOM_EXTENTS);
 			m_ActiveView->UpdateProjection();
 		} break;
 
 		case LC_VIEW_VIEWPOINT_LEFT:
 		{
-			m_ActiveView->mCamera->SetViewpoint(LC_VIEWPOINT_LEFT, m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys);
+			m_ActiveView->mCamera->SetViewpoint(LC_VIEWPOINT_LEFT, m_nCurStep, m_bAddKeys);
 			HandleCommand(LC_VIEW_ZOOM_EXTENTS);
 			m_ActiveView->UpdateProjection();
 		} break;
 
 		case LC_VIEW_VIEWPOINT_RIGHT:
 		{
-			m_ActiveView->mCamera->SetViewpoint(LC_VIEWPOINT_RIGHT, m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys);
+			m_ActiveView->mCamera->SetViewpoint(LC_VIEWPOINT_RIGHT, m_nCurStep, m_bAddKeys);
 			HandleCommand(LC_VIEW_ZOOM_EXTENTS);
 			m_ActiveView->UpdateProjection();
 		} break;
 
 		case LC_VIEW_VIEWPOINT_HOME:
 		{
-			m_ActiveView->mCamera->SetViewpoint(LC_VIEWPOINT_HOME, m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys);
+			m_ActiveView->mCamera->SetViewpoint(LC_VIEWPOINT_HOME, m_nCurStep, m_bAddKeys);
 			HandleCommand(LC_VIEW_ZOOM_EXTENTS);
 			m_ActiveView->UpdateProjection();
 		} break;
@@ -6964,50 +6829,35 @@ void Project::HandleCommand(LC_COMMANDS id)
 			gMainWindow->DoDialog(LC_DIALOG_ABOUT, (char*)Info);
 		} break;
 
-		case LC_VIEW_TIME_ANIMATION:
-		{
-			m_bAnimation = !m_bAnimation;
-
-			CalculateStep();
-			gMainWindow->UpdateFocusObject(GetFocusObject());
-			UpdateAllViews();
-
-			gMainWindow->UpdateAnimation(m_bAnimation, m_bAddKeys);
-			if (m_bAnimation)
-				gMainWindow->UpdateTime(m_bAnimation, m_nCurFrame, m_nTotalFrames);
-			else
-				gMainWindow->UpdateTime(m_bAnimation, m_nCurStep, 255);
-		} break;
-
 		case LC_VIEW_TIME_ADD_KEYS:
 		{
 			m_bAddKeys = !m_bAddKeys;
-			gMainWindow->UpdateAnimation(m_bAnimation, m_bAddKeys);
+			gMainWindow->UpdateAnimation(m_bAddKeys);
 		} break;
 
 		case LC_EDIT_SNAP_X:
-				if (m_nSnap & LC_DRAW_SNAP_X)
-					m_nSnap &= ~LC_DRAW_SNAP_X;
-				else
-					m_nSnap |= LC_DRAW_SNAP_X;
+			if (m_nSnap & LC_DRAW_SNAP_X)
+				m_nSnap &= ~LC_DRAW_SNAP_X;
+			else
+				m_nSnap |= LC_DRAW_SNAP_X;
 			gMainWindow->UpdateLockSnap(m_nSnap);
-				break;
+			break;
 
 		case LC_EDIT_SNAP_Y:
-				if (m_nSnap & LC_DRAW_SNAP_Y)
-					m_nSnap &= ~LC_DRAW_SNAP_Y;
-				else
-					m_nSnap |= LC_DRAW_SNAP_Y;
+			if (m_nSnap & LC_DRAW_SNAP_Y)
+				m_nSnap &= ~LC_DRAW_SNAP_Y;
+			else
+				m_nSnap |= LC_DRAW_SNAP_Y;
 			gMainWindow->UpdateLockSnap(m_nSnap);
-				break;
+			break;
 
 		case LC_EDIT_SNAP_Z:
-				if (m_nSnap & LC_DRAW_SNAP_Z)
-					m_nSnap &= ~LC_DRAW_SNAP_Z;
-				else
-					m_nSnap |= LC_DRAW_SNAP_Z;
+			if (m_nSnap & LC_DRAW_SNAP_Z)
+				m_nSnap &= ~LC_DRAW_SNAP_Z;
+			else
+				m_nSnap |= LC_DRAW_SNAP_Z;
 			gMainWindow->UpdateLockSnap(m_nSnap);
-				break;
+			break;
 
 		case LC_EDIT_SNAP_ALL:
 				m_nSnap |= LC_DRAW_SNAP_XYZ;
@@ -7015,54 +6865,54 @@ void Project::HandleCommand(LC_COMMANDS id)
 				break;
 
 		case LC_EDIT_SNAP_NONE:
-				m_nSnap &= ~LC_DRAW_SNAP_XYZ;
+			m_nSnap &= ~LC_DRAW_SNAP_XYZ;
 			gMainWindow->UpdateLockSnap(m_nSnap);
-				break;
+			break;
 
 		case LC_EDIT_SNAP_TOGGLE:
-				if ((m_nSnap & LC_DRAW_SNAP_XYZ) == LC_DRAW_SNAP_XYZ)
-					m_nSnap &= ~LC_DRAW_SNAP_XYZ;
-				else
-					m_nSnap |= LC_DRAW_SNAP_XYZ;
+			if ((m_nSnap & LC_DRAW_SNAP_XYZ) == LC_DRAW_SNAP_XYZ)
+				m_nSnap &= ~LC_DRAW_SNAP_XYZ;
+			else
+				m_nSnap |= LC_DRAW_SNAP_XYZ;
 			gMainWindow->UpdateLockSnap(m_nSnap);
-				break;
+			break;
 
 		case LC_EDIT_LOCK_X:
-				if (m_nSnap & LC_DRAW_LOCK_X)
-					m_nSnap &= ~LC_DRAW_LOCK_X;
-				else
-					m_nSnap |= LC_DRAW_LOCK_X;
+			if (m_nSnap & LC_DRAW_LOCK_X)
+				m_nSnap &= ~LC_DRAW_LOCK_X;
+			else
+				m_nSnap |= LC_DRAW_LOCK_X;
 			gMainWindow->UpdateLockSnap(m_nSnap);
-				break;
+			break;
 
 		case LC_EDIT_LOCK_Y:
-				if (m_nSnap & LC_DRAW_LOCK_Y)
-					m_nSnap &= ~LC_DRAW_LOCK_Y;
-				else
-					m_nSnap |= LC_DRAW_LOCK_Y;
+			if (m_nSnap & LC_DRAW_LOCK_Y)
+				m_nSnap &= ~LC_DRAW_LOCK_Y;
+			else
+				m_nSnap |= LC_DRAW_LOCK_Y;
 			gMainWindow->UpdateLockSnap(m_nSnap);
-				break;
+			break;
 
 		case LC_EDIT_LOCK_Z:
-				if (m_nSnap & LC_DRAW_LOCK_Z)
-					m_nSnap &= ~LC_DRAW_LOCK_Z;
-				else
-					m_nSnap |= LC_DRAW_LOCK_Z;
+			if (m_nSnap & LC_DRAW_LOCK_Z)
+				m_nSnap &= ~LC_DRAW_LOCK_Z;
+			else
+				m_nSnap |= LC_DRAW_LOCK_Z;
 			gMainWindow->UpdateLockSnap(m_nSnap);
-				break;
+			break;
 
 		case LC_EDIT_LOCK_NONE:
-				m_nSnap &= ~LC_DRAW_LOCK_XYZ;
+			m_nSnap &= ~LC_DRAW_LOCK_XYZ;
 			gMainWindow->UpdateLockSnap(m_nSnap);
-				break;
+			break;
 
 		case LC_EDIT_LOCK_TOGGLE:
-				if ((m_nSnap & LC_DRAW_LOCK_XYZ) == LC_DRAW_LOCK_XYZ)
-					m_nSnap &= ~LC_DRAW_LOCK_XYZ;
-				else
-					m_nSnap |= LC_DRAW_LOCK_XYZ;
+			if ((m_nSnap & LC_DRAW_LOCK_XYZ) == LC_DRAW_LOCK_XYZ)
+				m_nSnap &= ~LC_DRAW_LOCK_XYZ;
+			else
+				m_nSnap |= LC_DRAW_LOCK_XYZ;
 			gMainWindow->UpdateLockSnap(m_nSnap);
-				break;
+			break;
 
 		case LC_EDIT_SNAP_MOVE_XY0:
 		case LC_EDIT_SNAP_MOVE_XY1:
@@ -7575,7 +7425,7 @@ Object* Project::FindObjectFromPoint(View* view, int x, int y, bool PiecesOnly)
 	ClickLine.Closest = NULL;
 
 	for (Piece* pPiece = m_pPieces; pPiece; pPiece = pPiece->m_pNext)
-		if (pPiece->IsVisible(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation))
+		if (pPiece->IsVisible(m_nCurStep))
 			pPiece->MinIntersectDist(&ClickLine);
 
 	if (!PiecesOnly)
@@ -7656,7 +7506,7 @@ void Project::FindObjectsInBox(float x1, float y1, float x2, float y2, lcArray<O
 	// Check if any objects are inside the volume.
 	for (Piece* piece = m_pPieces; piece != NULL; piece = piece->m_pNext)
 	{
-		if (piece->IsVisible(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation))
+		if (piece->IsVisible(m_nCurStep))
 		{
 			if (piece->IntersectsVolume(Planes))
 				Objects.Add(piece);
@@ -7730,12 +7580,11 @@ bool Project::StopTracking(bool bAccept)
 				GetPieceInsertPosition(m_ActiveView, x, y, Pos, Rot);
 
 				Piece* pPiece = new Piece(mDropPiece);
-				pPiece->Initialize(Pos[0], Pos[1], Pos[2], m_nCurStep, m_nCurFrame);
+				pPiece->Initialize(Pos[0], Pos[1], Pos[2], m_nCurStep);
 				pPiece->SetColorIndex(gMainWindow->mColorIndex);
 
-				pPiece->ChangeKey(m_nCurStep, false, false, Rot, LC_PK_ROTATION);
-				pPiece->ChangeKey(m_nCurFrame, true, false, Rot, LC_PK_ROTATION);
-				pPiece->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+				pPiece->ChangeKey(m_nCurStep, false, Rot, LC_PK_ROTATION);
+				pPiece->UpdatePosition(m_nCurStep);
 
 				SelectAndFocusNone(false);
 				pPiece->CreateName(m_pPieces);
@@ -7782,8 +7631,7 @@ bool Project::StopTracking(bool bAccept)
 							if (pGroup != NULL)
 							{
 								for (Piece* pPiece = m_pPieces; pPiece; pPiece = pPiece->m_pNext)
-									if ((pPiece->IsVisible(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation)) &&
-											(pPiece->GetTopGroup() == pGroup))
+									if (pPiece->IsVisible(m_nCurStep) && (pPiece->GetTopGroup() == pGroup))
 										pPiece->Select (true, false, false);
 							}
 							else
@@ -7864,7 +7712,7 @@ bool Project::StopTracking(bool bAccept)
 					Bottom = m_OverlayTrackStart[1];
 				}
 
-				m_ActiveView->mCamera->ZoomRegion(m_ActiveView, Left, Right, Bottom, Top, m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys);
+				m_ActiveView->mCamera->ZoomRegion(m_ActiveView, Left, Right, Bottom, Top, m_nCurStep, m_bAddKeys);
 
 					gMainWindow->UpdateFocusObject(GetFocusObject());
 				UpdateAllViews();
@@ -8111,23 +7959,23 @@ bool Project::MoveSelectedObjects(lcVector3& Move, lcVector3& Remainder, bool Sn
 
 		if (pCamera->IsSelected())
 		{
-			pCamera->Move(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys, x, y, z);
-			pCamera->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+			pCamera->Move(m_nCurStep, m_bAddKeys, x, y, z);
+			pCamera->UpdatePosition(m_nCurStep);
 		}
 	}
 
 	for (pLight = m_pLights; pLight; pLight = pLight->m_pNext)
 		if (pLight->IsSelected())
 		{
-			pLight->Move (m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys, x, y, z);
-			pLight->UpdatePosition (m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+			pLight->Move (m_nCurStep, m_bAddKeys, x, y, z);
+			pLight->UpdatePosition (m_nCurStep);
 		}
 
 	for (pPiece = m_pPieces; pPiece; pPiece = pPiece->m_pNext)
 		if (pPiece->IsSelected())
 		{
-			pPiece->Move(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys, x, y, z);
-			pPiece->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+			pPiece->Move(m_nCurStep, m_bAddKeys, x, y, z);
+			pPiece->UpdatePosition(m_nCurStep);
 		}
 
 	// TODO: move group centers
@@ -8288,7 +8136,7 @@ bool Project::RotateSelectedObjects(lcVector3& Delta, lcVector3& Remainder, bool
 			pos[1] = Center[1] + Distance[1];
 			pos[2] = Center[2] + Distance[2];
 
-			pPiece->ChangeKey(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys, pos, LC_PK_POSITION);
+			pPiece->ChangeKey(m_nCurStep, m_bAddKeys, pos, LC_PK_POSITION);
 		}
 
 		rot[0] = NewRotation[0];
@@ -8296,8 +8144,8 @@ bool Project::RotateSelectedObjects(lcVector3& Delta, lcVector3& Remainder, bool
 		rot[2] = NewRotation[2];
 		rot[3] = NewRotation[3] * LC_RTOD;
 
-		pPiece->ChangeKey(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys, rot, LC_PK_ROTATION);
-		pPiece->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+		pPiece->ChangeKey(m_nCurStep, m_bAddKeys, rot, LC_PK_ROTATION);
+		pPiece->UpdatePosition(m_nCurStep);
 	}
 
 	if (m_OverlayActive)
@@ -8347,8 +8195,8 @@ void Project::TransformSelectedObjects(LC_TRANSFORM_TYPE Type, const lcVector3&
 
 				if (pCamera->IsSelected())
 				{
-					pCamera->Move(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys, Offset.x, Offset.y, Offset.z);
-					pCamera->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+					pCamera->Move(m_nCurStep, m_bAddKeys, Offset.x, Offset.y, Offset.z);
+					pCamera->UpdatePosition(m_nCurStep);
 				}
 			}
 
@@ -8356,8 +8204,8 @@ void Project::TransformSelectedObjects(LC_TRANSFORM_TYPE Type, const lcVector3&
 			{
 				if (pLight->IsSelected())
 				{
-					pLight->Move(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys, Offset.x, Offset.y, Offset.z);
-					pLight->UpdatePosition (m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+					pLight->Move(m_nCurStep, m_bAddKeys, Offset.x, Offset.y, Offset.z);
+					pLight->UpdatePosition (m_nCurStep);
 				}
 			}
 
@@ -8365,8 +8213,8 @@ void Project::TransformSelectedObjects(LC_TRANSFORM_TYPE Type, const lcVector3&
 			{
 				if (pPiece->IsSelected())
 				{
-					pPiece->Move(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys, Offset.x, Offset.y, Offset.z);
-					pPiece->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+					pPiece->Move(m_nCurStep, m_bAddKeys, Offset.x, Offset.y, Offset.z);
+					pPiece->UpdatePosition(m_nCurStep);
 				}
 			}
 
@@ -8433,8 +8281,8 @@ void Project::TransformSelectedObjects(LC_TRANSFORM_TYPE Type, const lcVector3&
 			{
 				if (pPiece->IsSelected())
 				{
-					pPiece->ChangeKey(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys, NewRotation, LC_PK_ROTATION);
-					pPiece->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+					pPiece->ChangeKey(m_nCurStep, m_bAddKeys, NewRotation, LC_PK_ROTATION);
+					pPiece->UpdatePosition(m_nCurStep);
 					nSel++;
 				}
 			}
@@ -8484,8 +8332,8 @@ void Project::ModifyObject(Object* Object, lcObjectProperty Property, void* Valu
 
 			if (Part->mPosition != Position)
 		{
-				Part->ChangeKey(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys, Position, LC_PK_POSITION);
-				Part->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+				Part->ChangeKey(m_nCurStep, m_bAddKeys, Position, LC_PK_POSITION);
+				Part->UpdatePosition(m_nCurStep);
 
 				CheckPointString = "Moving";
 			}
@@ -8498,8 +8346,8 @@ void Project::ModifyObject(Object* Object, lcObjectProperty Property, void* Valu
 
 			if (Rotation != Part->mRotation)
 		{
-				Part->ChangeKey(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys, Rotation, LC_PK_ROTATION);
-				Part->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+				Part->ChangeKey(m_nCurStep, m_bAddKeys, Rotation, LC_PK_ROTATION);
+				Part->UpdatePosition(m_nCurStep);
 
 				CheckPointString = "Rotating";
 			}
@@ -8510,58 +8358,34 @@ void Project::ModifyObject(Object* Object, lcObjectProperty Property, void* Valu
 			lcuint32 Show = *(lcuint32*)Value;
 			Piece* Part = (Piece*)Object;
 
-			if (m_bAnimation)
+			if (Show != Part->GetStepShow())
 			{
-				if (Show != Part->GetFrameShow())
-				{
-					Part->SetFrameShow(Show);
+				Part->SetStepShow(Show);
 
-					CheckPointString = "Show";
-				}
-				}
-				else
-				{
-				if (Show != Part->GetStepShow())
-						{
-					Part->SetStepShow(Show);
-
-					CheckPointString = "Show";
-						}
-				}
+				CheckPointString = "Show";
+			}
 		} break;
 
 	case LC_PART_HIDE:
-			{
+		{
 			lcuint32 Hide = *(lcuint32*)Value;
 			Piece* Part = (Piece*)Object;
 
-			if (m_bAnimation)
-				{
-				if (Hide != Part->GetFrameHide())
-					{
-					Part->SetFrameHide(Hide);
+			if (Hide != Part->GetStepHide())
+			{
+				Part->SetStepHide(Hide);
 
-					CheckPointString = "Hide";
-						}
-					}
-				else
-				{
-				if (Hide != Part->GetStepHide())
-							{
-					Part->SetStepHide(Hide);
-
-					CheckPointString = "Hide";
-				}
+				CheckPointString = "Hide";
 			}
 		} break;
 
 	case LC_PART_COLOR:
-			{
+		{
 			int ColorIndex = *(int*)Value;
 			Piece* Part = (Piece*)Object;
 
 			if (ColorIndex != Part->mColorIndex)
-        {
+			{
 				Part->SetColorIndex(ColorIndex);
 
 				CheckPointString = "Color";
@@ -8589,37 +8413,37 @@ void Project::ModifyObject(Object* Object, lcObjectProperty Property, void* Valu
 			Camera* camera = (Camera*)Object;
 
 			if (camera->mPosition != Position)
-{
-				camera->ChangeKey(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys, Position, LC_CK_EYE);
-				camera->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+			{
+				camera->ChangeKey(m_nCurStep, m_bAddKeys, Position, LC_CK_EYE);
+				camera->UpdatePosition(m_nCurStep);
 
 				CheckPointString = "Camera";
 			}
 		} break;
 
 	case LC_CAMERA_TARGET:
-			{
+		{
 			const lcVector3& TargetPosition = *(lcVector3*)Value;
 			Camera* camera = (Camera*)Object;
 
 			if (camera->mTargetPosition != TargetPosition)
-				{
-				camera->ChangeKey(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys, TargetPosition, LC_CK_TARGET);
-				camera->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+			{
+				camera->ChangeKey(m_nCurStep, m_bAddKeys, TargetPosition, LC_CK_TARGET);
+				camera->UpdatePosition(m_nCurStep);
 
 				CheckPointString = "Camera";
-				}
+			}
 		} break;
 
 	case LC_CAMERA_UP:
-				{
+		{
 			const lcVector3& Up = *(lcVector3*)Value;
 			Camera* camera = (Camera*)Object;
 
 			if (camera->mUpVector != Up)
-					{
-				camera->ChangeKey(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys, Up, LC_CK_UP);
-				camera->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+			{
+				camera->ChangeKey(m_nCurStep, m_bAddKeys, Up, LC_CK_UP);
+				camera->UpdatePosition(m_nCurStep);
 
 				CheckPointString = "Camera";
 			}
@@ -8631,26 +8455,26 @@ void Project::ModifyObject(Object* Object, lcObjectProperty Property, void* Valu
 			Camera* camera = (Camera*)Object;
 
 			if (camera->m_fovy != FOV)
-		{
+			{
 				camera->m_fovy = FOV;
-				camera->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+				camera->UpdatePosition(m_nCurStep);
 
 				CheckPointString = "Camera";
-					}
+			}
 		} break;
 
 	case LC_CAMERA_NEAR:
-				{
+		{
 			float Near = *(float*)Value;
 			Camera* camera = (Camera*)Object;
 
 			if (camera->m_zNear != Near)
 			{
 				camera->m_zNear= Near;
-				camera->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+				camera->UpdatePosition(m_nCurStep);
 
 				CheckPointString = "Camera";
-					}
+			}
 		} break;
 
 	case LC_CAMERA_FAR:
@@ -8659,9 +8483,9 @@ void Project::ModifyObject(Object* Object, lcObjectProperty Property, void* Valu
 			Camera* camera = (Camera*)Object;
 
 			if (camera->m_zFar != Far)
-		{
+			{
 				camera->m_zFar = Far;
-				camera->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+				camera->UpdatePosition(m_nCurStep);
 
 				CheckPointString = "Camera";
 			}
@@ -8696,7 +8520,7 @@ void Project::ModifyObject(Object* Object, lcObjectProperty Property, void* Valu
 
 void Project::ZoomActiveView(int Amount)
 {
-	m_ActiveView->mCamera->DoZoom(Amount, m_nMouse, m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys);
+	m_ActiveView->mCamera->DoZoom(Amount, m_nMouse, m_nCurStep, m_bAddKeys);
 	gMainWindow->UpdateFocusObject(GetFocusObject());
 	UpdateOverlayScale();
 	UpdateAllViews();
@@ -8899,12 +8723,11 @@ void Project::OnLeftButtonDown(View* view)
 				GetPieceInsertPosition(view, x, y, Pos, Rot);
 
 				Piece* pPiece = new Piece(m_pCurPiece);
-				pPiece->Initialize(Pos[0], Pos[1], Pos[2], m_nCurStep, m_nCurFrame);
+				pPiece->Initialize(Pos[0], Pos[1], Pos[2], m_nCurStep);
 				pPiece->SetColorIndex(gMainWindow->mColorIndex);
 
-				pPiece->ChangeKey(m_nCurStep, false, false, Rot, LC_PK_ROTATION);
-				pPiece->ChangeKey(m_nCurFrame, true, false, Rot, LC_PK_ROTATION);
-				pPiece->UpdatePosition(m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation);
+				pPiece->ChangeKey(m_nCurStep, false, Rot, LC_PK_ROTATION);
+				pPiece->UpdatePosition(m_nCurStep);
 
 				SelectAndFocusNone(false);
 				pPiece->CreateName(m_pPieces);
@@ -9308,8 +9131,8 @@ void Project::OnMouseMove(View* view)
 
 			Light* pLight = m_pLights;
 
-			pLight->Move (1, m_bAnimation, false, delta[0], delta[1], delta[2]);
-			pLight->UpdatePosition (1, m_bAnimation);
+			pLight->Move(1, false, delta[0], delta[1], delta[2]);
+			pLight->UpdatePosition(1);
 
 			gMainWindow->UpdateFocusObject(pLight);
 			UpdateAllViews();
@@ -9327,8 +9150,8 @@ void Project::OnMouseMove(View* view)
 
 			Camera* pCamera = mCameras[mCameras.GetSize() - 1];
 
-			pCamera->Move(1, m_bAnimation, false, delta[0], delta[1], delta[2]);
-			pCamera->UpdatePosition(1, m_bAnimation);
+			pCamera->Move(1, false, delta[0], delta[1], delta[2]);
+			pCamera->UpdatePosition(1);
 
 			gMainWindow->UpdateFocusObject(pCamera);
 			UpdateAllViews();
@@ -9682,7 +9505,7 @@ void Project::OnMouseMove(View* view)
 			if (m_nDownY == y)
 				break;
 
-			m_ActiveView->mCamera->DoZoom(y - m_nDownY, m_nMouse, m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys);
+			m_ActiveView->mCamera->DoZoom(y - m_nDownY, m_nMouse, m_nCurStep, m_bAddKeys);
 			m_nDownY = y;
 			gMainWindow->UpdateFocusObject(GetFocusObject());
 			UpdateAllViews();
@@ -9703,7 +9526,7 @@ void Project::OnMouseMove(View* view)
 			if ((m_nDownY == y) && (m_nDownX == x))
 				break;
 
-			m_ActiveView->mCamera->DoPan(x - m_nDownX, y - m_nDownY, m_nMouse, m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys);
+			m_ActiveView->mCamera->DoPan(x - m_nDownX, y - m_nDownY, m_nMouse, m_nCurStep, m_bAddKeys);
 			m_nDownX = x;
 			m_nDownY = y;
 			gMainWindow->UpdateFocusObject(GetFocusObject());
@@ -9726,19 +9549,19 @@ void Project::OnMouseMove(View* view)
 			switch (m_OverlayMode)
 			{
 				case LC_OVERLAY_ROTATE_VIEW_XYZ:
-					m_ActiveView->mCamera->DoRotate(x - m_nDownX, y - m_nDownY, m_nMouse, m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys, bs);
+					m_ActiveView->mCamera->DoRotate(x - m_nDownX, y - m_nDownY, m_nMouse, m_nCurStep, m_bAddKeys, bs);
 					break;
 
 				case LC_OVERLAY_ROTATE_VIEW_X:
-					m_ActiveView->mCamera->DoRotate(x - m_nDownX, 0, m_nMouse, m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys, bs);
+					m_ActiveView->mCamera->DoRotate(x - m_nDownX, 0, m_nMouse, m_nCurStep, m_bAddKeys, bs);
 					break;
 
 				case LC_OVERLAY_ROTATE_VIEW_Y:
-					m_ActiveView->mCamera->DoRotate(0, y - m_nDownY, m_nMouse, m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys, bs);
+					m_ActiveView->mCamera->DoRotate(0, y - m_nDownY, m_nMouse, m_nCurStep, m_bAddKeys, bs);
 					break;
 
 				case LC_OVERLAY_ROTATE_VIEW_Z:
-					m_ActiveView->mCamera->DoRoll(x - m_nDownX, m_nMouse, m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys);
+					m_ActiveView->mCamera->DoRoll(x - m_nDownX, m_nMouse, m_nCurStep, m_bAddKeys);
 					break;
 			}
 
@@ -9753,7 +9576,7 @@ void Project::OnMouseMove(View* view)
 			if (m_nDownX == x)
 				break;
 
-			m_ActiveView->mCamera->DoRoll(x - m_nDownX, m_nMouse, m_bAnimation ? m_nCurFrame : m_nCurStep, m_bAnimation, m_bAddKeys);
+			m_ActiveView->mCamera->DoRoll(x - m_nDownX, m_nMouse, m_nCurStep, m_bAddKeys);
 			m_nDownX = x;
 			gMainWindow->UpdateFocusObject(GetFocusObject());
 			UpdateAllViews();
diff --git a/common/project.h b/common/project.h
index 69fb5b77..d22c9c10 100644
--- a/common/project.h
+++ b/common/project.h
@@ -215,18 +215,11 @@ public:
 
 	// Access to protected members
 	unsigned char GetLastStep();
-	bool IsAnimation()
-		{ return m_bAnimation; }
-	void SetAnimation(bool Anim)
-	{ m_bAnimation = Anim; } // only to be called from lcApplication::Initialize()
 	unsigned short GetCurrentTime ()
-		{ return m_bAnimation ? m_nCurFrame : m_nCurStep; }
+		{ return m_nCurStep; }
 	void SetCurrentTime(unsigned short Time)
 	{
-		if (m_bAnimation)
-			m_nCurFrame = Time;
-		else
-			m_nCurStep = (unsigned char)Time;
+		m_nCurStep = (unsigned char)Time;
 		CalculateStep();
 	}
 	void SetCurrentPiece(PieceInfo* pInfo)
@@ -242,11 +235,9 @@ public:
 	void GetSnapDistance(float* SnapXY, float* SnapZ) const;
 	void GetTimeRange(int* from, int* to)
 	{
-		*from = m_bAnimation ? m_nCurFrame : m_nCurStep;
-		*to = m_bAnimation ? m_nTotalFrames : 255;
+		*from = m_nCurStep;
+		*to = 255;
 	}
-	unsigned short GetTotalFrames () const
-		{ return m_nTotalFrames; }
 
 	void ConvertToUserUnits(lcVector3& Value) const;
 	void ConvertFromUserUnits(lcVector3& Value) const;
@@ -353,7 +344,6 @@ protected:
 	void ExportPOVRay(lcFile& File);
 	void ZoomExtents(int FirstView, int LastView);
 
-	bool m_bStopRender;
 	lcFile* m_pTrackFile;
 	bool m_bTrackCancel;
 	int m_nTracking;
@@ -405,12 +395,8 @@ protected:
 	int m_nCurAction;
 	PieceInfo* m_pCurPiece;
 	PieceInfo* mDropPiece;
-	bool m_bAnimation;
 	bool m_bAddKeys;
-	unsigned char m_nFPS;
 	unsigned char m_nCurStep;
-	lcuint16 m_nCurFrame;
-	lcuint16 m_nTotalFrames;
 
 	bool mGridStuds;
 	lcuint32 mGridStudColor;
diff --git a/common/view.cpp b/common/view.cpp
index 67762deb..9345541f 100644
--- a/common/view.cpp
+++ b/common/view.cpp
@@ -49,7 +49,7 @@ void View::SetDefaultCamera()
 	if (!mCamera || !mCamera->IsSimple())
 		mCamera = new Camera(true);
 
-	mCamera->SetViewpoint(LC_VIEWPOINT_HOME, 1, false, false);
+	mCamera->SetViewpoint(LC_VIEWPOINT_HOME, 1, false);
 }
 
 LC_CURSOR_TYPE View::GetCursor() const
diff --git a/qt/lc_qmainwindow.cpp b/qt/lc_qmainwindow.cpp
index f120155e..26124be2 100644
--- a/qt/lc_qmainwindow.cpp
+++ b/qt/lc_qmainwindow.cpp
@@ -813,8 +813,6 @@ void lcQMainWindow::print(QPrinter *printer)
 	glPixelStorei(GL_PACK_ALIGNMENT, 1);
 
 	unsigned short previousTime = project->GetCurrentTime();
-	bool wasAnimation = project->IsAnimation();
-	project->SetAnimation(false);
 
 	QPainter painter(printer);
 	lcuint8 *buffer = (lcuint8*)malloc(tileWidth * tileHeight * 4);
@@ -996,8 +994,6 @@ void lcQMainWindow::print(QPrinter *printer)
 
 	free(buffer);
 
-	if (wasAnimation)
-		project->SetAnimation(true);
 	project->SetCurrentTime(previousTime);
 
 	GL_EndRenderToTexture();
@@ -1132,26 +1128,20 @@ void lcQMainWindow::updatePaste(bool enabled)
 		action->setEnabled(enabled);
 }
 
-void lcQMainWindow::updateTime(bool animation, int currentTime, int totalTime)
+void lcQMainWindow::updateTime(int currentTime, int totalTime)
 {
 	actions[LC_VIEW_TIME_FIRST]->setEnabled(currentTime != 1);
 	actions[LC_VIEW_TIME_PREVIOUS]->setEnabled(currentTime > 1);
 	actions[LC_VIEW_TIME_NEXT]->setEnabled(currentTime < totalTime);
 	actions[LC_VIEW_TIME_LAST]->setEnabled(currentTime != totalTime);
 
-	if (animation)
-		statusTimeLabel->setText(QString(tr(" %1 / %2 ")).arg(QString::number(currentTime), QString::number(totalTime)));
-	else
-		statusTimeLabel->setText(QString(tr(" Step %1 ")).arg(QString::number(currentTime)));
+	statusTimeLabel->setText(QString(tr(" Step %1 ")).arg(QString::number(currentTime)));
 }
 
-void lcQMainWindow::updateAnimation(bool animation, bool addKeys)
+void lcQMainWindow::updateAnimation(bool addKeys)
 {
 	// TODO: update animation
 	/*
-	gtk_widget_set_sensitive (anim_toolbar.play, bAnimation);
-	gtk_widget_set_sensitive (anim_toolbar.stop, FALSE);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(anim_toolbar.anim), bAnimation);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(anim_toolbar.keys), bAddKeys);
 	*/
 }
diff --git a/qt/lc_qmainwindow.h b/qt/lc_qmainwindow.h
index 499bb1f0..3a95c34f 100644
--- a/qt/lc_qmainwindow.h
+++ b/qt/lc_qmainwindow.h
@@ -36,8 +36,8 @@ public:
 	void updateSelectedObjects(int flags, int selectedCount, Object* focus);
 	void updateAction(int newAction);
 	void updatePaste(bool enabled);
-	void updateTime(bool animation, int currentTime, int totalTime);
-	void updateAnimation(bool animation, bool addKeys);
+	void updateTime(int currentTime, int totalTime);
+	void updateAnimation(bool addKeys);
 	void updateLockSnap(lcuint32 snap);
 	void updateSnap();
 	void updateUndoRedo(const char* undoText, const char* redoText);
diff --git a/qt/lc_qpropertiestree.cpp b/qt/lc_qpropertiestree.cpp
index a5f4b962..71307300 100644
--- a/qt/lc_qpropertiestree.cpp
+++ b/qt/lc_qpropertiestree.cpp
@@ -783,17 +783,8 @@ void lcQPropertiesTree::setPart(Object *newFocusObject)
 	partRotationZ->setText(1, QString::number(rotation[2]));
 	partRotationZ->setData(0, PropertyValueRole, rotation[2]);
 
-	lcuint32 show, hide;
-	if (lcGetActiveProject()->IsAnimation())
-	{
-		show = part->GetFrameShow();
-		hide = part->GetFrameHide();
-	}
-	else
-	{
-		show = part->GetStepShow();
-		hide = part->GetStepHide();
-	}
+	lcuint32 show = part->GetStepShow();
+	lcuint32 hide = part->GetStepHide();
 
 	partShow->setText(1, QString::number(show));
 	partShow->setData(0, PropertyValueRole, show);
diff --git a/qt/lc_qselectdialog.cpp b/qt/lc_qselectdialog.cpp
index 3953d1b4..61b5b288 100644
--- a/qt/lc_qselectdialog.cpp
+++ b/qt/lc_qselectdialog.cpp
@@ -167,7 +167,7 @@ void lcQSelectDialog::addChildren(QTreeWidgetItem *parentItem, Group *parentGrou
 		if (piece->GetGroup() != parentGroup)
 			continue;
 
-		if (!piece->IsVisible(project->GetCurrentTime(), project->IsAnimation()))
+		if (!piece->IsVisible(project->GetCurrentTime()))
 			continue;
 
 		QTreeWidgetItem *pieceItem = new QTreeWidgetItem(parentItem, QStringList(piece->GetName()));
diff --git a/qt/qtmain.cpp b/qt/qtmain.cpp
index 483d4f81..60757bb8 100644
--- a/qt/qtmain.cpp
+++ b/qt/qtmain.cpp
@@ -499,20 +499,20 @@ void lcMainWindow::UpdatePaste(bool Enabled)
 		window->updatePaste(Enabled);
 }
 
-void lcMainWindow::UpdateTime(bool Animation, int CurrentTime, int TotalTime)
+void lcMainWindow::UpdateTime(int CurrentTime, int TotalTime)
 {
 	lcQMainWindow* window = (lcQMainWindow*)mHandle;
 
 	if (window)
-		window->updateTime(Animation, CurrentTime, TotalTime);
+		window->updateTime(CurrentTime, TotalTime);
 }
 
-void lcMainWindow::UpdateAnimation(bool Animation, bool AddKeys)
+void lcMainWindow::UpdateAnimation(bool AddKeys)
 {
 	lcQMainWindow* window = (lcQMainWindow*)mHandle;
 
 	if (window)
-		window->updateAnimation(Animation, AddKeys);
+		window->updateAnimation(AddKeys);
 }
 
 void lcMainWindow::UpdateLockSnap(lcuint32 Snap)