diff --git a/xsl/atom.xsl b/xsl/atom.xsl
index a1b00a0..3d7d808 100644
--- a/xsl/atom.xsl
+++ b/xsl/atom.xsl
@@ -43,24 +43,21 @@
 	<author>
 	<name>University of Waterloo Computer Science Club</name>
 	</author>
-	<xsl:apply-templates select="newsitem" />
-	<xsl:apply-templates select="eventitem" />
+	<xsl:for-each select="newsitem">
+		<entry>
+        	<link href="http://csclub.uwaterloo.ca"/>
+        	<summary><xsl:value-of select="."/></summary>
+		<author><xsl:value-of select="@author"/></author>
+        	</entry>
+	</xsl:for-each>
+        <xsl:for-each select="eventitem">
+		<entry>
+        	<title><xsl:value-of select="short"/></title>
+        	<link href="http://csclub.uwaterloo.ca"/>
+        	<summary><xsl:value-of select="abstract"/></summary>
+        	</entry>
+	</xsl:for-each>
 	</feed>
 </xsl:template>
 
-<xsl:template match="//eventitem">
-	<entry>
-	<title><xsl:value-of select="//short"/></title>
-	<link href="http://csclub.uwaterloo.ca"/>
-	<summary><xsl:value-of select="//abstract"/></summary>
-	</entry>
-</xsl:template>
-
-<xsl:template match="//newsitem">
-	<entry>
-	<link href="http://csclub.uwaterloo.ca"/>
-	<summary><xsl:value-of select="//newsitem"/></summary>
-	</entry>
-</xsl:template>
-
 </xsl:stylesheet>