diff --git a/nq/include/render.h b/nq/include/render.h
index d25632098..970beb265 100644
--- a/nq/include/render.h
+++ b/nq/include/render.h
@@ -43,13 +43,11 @@
 typedef struct entity_s
 {
 	qboolean				forcelink;		// model changed
-
-	int						keynum; // FIXME: hack to match qw
 	int						update_type;
-
 	entity_state_t			baseline;		// to fill in defaults in updates
-
 	double					msgtime;		// time of last update
+
+	int						keynum; // for matching entities in different frames
 	vec3_t					origin;
 	vec3_t					old_origin;
 	vec3_t					angles;
@@ -60,14 +58,14 @@ typedef struct entity_s
 	byte					*colormap;
 	int						skinnum;		// for Alias models
 
+	struct player_info_s	*scoreboard;	// identify player
+
 	float					syncbase;		// for client-side animations
 
 	struct efrag_s			*efrag;			// linked list of efrags
 	int						visframe;		// last frame this entity was
 											// found in an active leaf
 	int						effects;		// light, particals, etc
-	int						dlightframe;	// dynamic lighting
-	int						dlightbits;
 
 	float					colormod[3];	// color tint for model
 	float					alpha;			// opacity (alpha) of the model
diff --git a/qw/include/render.h b/qw/include/render.h
index 180219151..0446a3944 100644
--- a/qw/include/render.h
+++ b/qw/include/render.h
@@ -34,20 +34,18 @@
 #include "QF/model.h"
 #include "QF/vid.h"
 
-// now we know why (struct model_s *) is used here instead of model_t
-// damn circular reference ! same with player_info_s -- yan
-
 #define	TOP_RANGE		16			// soldier uniform colors
 #define	BOTTOM_RANGE	96
 
 
-// LordHavoc: reindented this after 'Endy was here', also added scale.
 typedef struct entity_s
 {
 	int						keynum; // for matching entities in different frames
 	vec3_t					origin;
 	vec3_t					old_origin;
 	vec3_t					angles;
+	vec3_t					msg_origins[2];	// last two updates (0 is newest)
+	vec3_t					msg_angles[2];	// last two updates (0 is newest)
 	struct model_s			*model;			// NULL = no model
 	int						frame;
 	byte					*colormap;