diff --git a/_includes/src/templates/upcoming.html b/_includes/src/templates/upcoming.html
index 752eea3..81b61cd 100644
--- a/_includes/src/templates/upcoming.html
+++ b/_includes/src/templates/upcoming.html
@@ -8,9 +8,9 @@ <h2 class="promo-title">Upcoming Public Trainings</h2>
       
         <div>
           {{ course['description'] }} [<a href="{{ course['url'] }}">read more ...</a>]
-          <br/>
-          <br/>
-          <a href="http://{{ course['doattend'] }}.doattend.com/"><img src='http://doattend.com/assets/btnw-reg-now.png'/></a>
+          <div style="text-align: center; padding: 10px;">
+            <a href="http://{{ course['doattend'] }}.doattend.com/"><img src='http://doattend.com/assets/btnw-reg-now.png'/></a>
+          </div>
         </div>
       </div>
     {% endfor %}
diff --git a/_includes/src/upcoming.py b/_includes/src/upcoming.py
index 05b1c66..3f7d418 100644
--- a/_includes/src/upcoming.py
+++ b/_includes/src/upcoming.py
@@ -12,7 +12,7 @@
 
 def parse_upcoming():
     d = yaml.load(open(SOURCE).read())
-    upcoming = d.pop('upcoming')
+    upcoming = d.pop('upcoming') or {}
 
     for key in d:
         course = d[key]
diff --git a/_includes/upcoming.html b/_includes/upcoming.html
index fd55a24..e69de29 100644
--- a/_includes/upcoming.html
+++ b/_includes/upcoming.html
@@ -1,15 +0,0 @@
-  <div class="promo">
-    <h2 class="promo-title">Upcoming Public Trainings</h2>
-
-    <div class="promo-item">
-      <a href="/trainings/python.html">Python Programming</a>
-      <p class="meta" style="color: #555;">August 4-5, 2012 &#8211; Bangalore</p>
-    
-      <div>
-        Two day course on python programming language. [<a href="/trainings/python.html">read more ...</a>]
-        <br/>
-        <br/>
-        <a href='http://py.doattend.com'><img src='http://doattend.com/assets/btnw-reg-now.png'/></a>
-      </div>
-    </div>
-  </div>
diff --git a/_includes/upcoming.yml b/_includes/upcoming.yml
index 89ae3ac..e6e0229 100644
--- a/_includes/upcoming.yml
+++ b/_includes/upcoming.yml
@@ -2,8 +2,8 @@
 python:
     key: python
     name: Python Programming
-    dates: Sometime in december?
-    doattend: 
+    dates: November 17-18, 2012
+    doattend: pythontraining-nov2012
     description:
         Hands-on course on introduction to Python programming language.
     long-description:
@@ -34,6 +34,7 @@ httpbottomup:
         and building web applications in a bottom-up approach.
 
 upcoming:
-    - advanced-python
+    #- advanced-python
+    #- python
     #- httpbottomup
 
diff --git a/_layouts/default.html b/_layouts/default.html
index e82d690..7eb0cec 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -5,9 +5,7 @@
     <title>{{ page.title }}</title>
     <meta name="author" content="Anand Chitipothu" />
     
-    <!--
-   <link href="http://feeds.feedburner.com/anandology" rel="alternate" title="Anand Chitipothu" type="application/atom+xml" />
-    -->
+   <link href="/atom.xml" rel="alternate" title="Atom Feed" type="application/atom+xml" />
 
     <!-- syntax highlighting CSS -->
     <link rel="stylesheet" href="/css/syntax.css" type="text/css" />
diff --git a/atom.xml b/atom.xml
new file mode 100644
index 0000000..5564125
--- /dev/null
+++ b/atom.xml
@@ -0,0 +1,30 @@
+---
+layout: nil
+---
+<?xml version="1.0"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+ 
+  <title>Anand Chitipothu</title>
+  <link href="http://anandology.com/"/>
+  <link type="application/atom+xml" rel="self" href="http://anandology.com/atom.xml"/>
+  <updated>{{ site.time | date_to_xmlschema }}</updated>
+  <id>http://anandology.com/</id>
+  <author>
+    <name>Anand Chitipothu</name>
+  </author>
+ 
+  {% for post in site.posts %}
+  <entry>
+    <id>http://anandology.com{{ post.id }}</id>
+    <link type="text/html" rel="alternate" href="http://anandology.com{{ post.url }}"/>
+    <title>{{ post.title }}</title>
+    <published>{{ post.date | date_to_xmlschema }}</published>
+    <updated>{{ post.date | date_to_xmlschema }}</updated>
+    <author>
+      <name>Anand Chitipothu</name>
+    </author>
+    <content type="html">{{ post.content | xml_escape }}</content>
+  </entry>
+  {% endfor %}
+ 
+</feed>
diff --git a/css/style.css b/css/style.css
index 919e10c..ebef8bb 100644
--- a/css/style.css
+++ b/css/style.css
@@ -158,8 +158,8 @@ pre {
 .promo {
     float: right; 
     width: 300px;
-    background: #eee;
-    border: 1px solid #ddd;
+    background: #ffe;
+    border: 1px solid #ddb;
     border-radius: 10px;
     padding: 10px;
     text-align: left;
@@ -184,4 +184,4 @@ a.anchor {
 
 #page h3 {
     font-size: 1.1em;
-}
\ No newline at end of file
+}
diff --git a/index.html b/index.html
index aebaac5..3c49fbf 100644
--- a/index.html
+++ b/index.html
@@ -16,6 +16,11 @@ <h1>Blog Posts</h1>
 
   <h1>Presentations</h1>
   <ul class="posts">
+      <li>
+        <span>29 Sept 2012</span> &raquo; 
+        <a href="/presentations/solving-puzzles-with-python/">Solving Puzzles with Python</a>
+        at <a href="http://in.pycon.org/2012/">PyCon India 2012, Bangalore</a>
+      </li>
       <li>
         <span>01 Oct 2011</span> &raquo; 
         <a href="/presentations/jsfoo-bangalore/inside-javascript-objects/">Inside Javascript Objects</a>