Refactoring, Added 3D track