diff --git a/buildout.cfg b/buildout.cfg
index 9e10556..5ca5fd8 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -10,7 +10,6 @@ eggs = emencia.django.newsletter
        BeautifulSoup
        html2text
        vobject
-       pyofc2
 
 find-links = http://dist.repoze.org/
 extensions=gp.vcsdevelop
diff --git a/emencia/django/newsletter/ofc.py b/emencia/django/newsletter/ofc.py
index 5289628..5ca3d1e 100755
--- a/emencia/django/newsletter/ofc.py
+++ b/emencia/django/newsletter/ofc.py
@@ -1,81 +1,56 @@
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # Author: Eugene Kin Chee Yip
 # Date:   16 January 2010
+# Modified by: Fantomas42
 
-try:
-	import	cjson
-	NO_CJSON = False
-except ImportError:
-	import json
-	NO_CJSON = True
-import	copy	
+import	copy
 
-class Chart(dict):
-	# Dictionary for replacing attribute names
-	replaceKeyDictionary =	{
-		"on_show": "on-show",			"on_click": "on-click",
-		"start_angle": "start-angle",	"javascript_function": "javascript-function",
-		
-		"threeD": "3d",					"tick_height": "tick-height",
-		"grid_colour": "grid-colour",	"tick_length": "tick-length",
-		"spoke_labels": "spoke-labels",	"barb_length": "barb-length",
-	
-		"dot_style": "dot-style",		"dot_size": "dot-size",
-		"halo_size": "halo-size",
-			
-		"line_style": "line-style",		"outline_colour": "outline-colour",
-		"fill_alpha": "fill-alpha",		"gradient_fill": "gradient-fill",
-		
-		"negative_colour": "negative-colour",
-	}
-
-	# Redefine to allow for nested attributes.
-	# E.g. when calling the leaf attribute, text, in chart.title.text
-	#      without previously defining the branch attribute, title.
-	def __getattribute__(self, key):
-		try:
-			return dict.__getattribute__(self, key)
-		except AttributeError:
-			self.__dict__[key] = Chart()
-			return dict.__getattribute__(self, key)
-
-	# This copy function is called when we want to get all the attributes of the 
-	# chart instance so we can pass it off to cjson to create the JSON string.
-	# Recursive trick to get leaf attributes.  Have to be careful of list types.
-	# Also, replace certain underscored keys.
-	# E.g. getting the leaf attribute, text, from the parent Chart instance where a  
-	#      previous assignment was to chart.title.text
-	def __copy__(self):
-		attributes = dict()
-		for key, value in self.__dict__.items():
-			if isinstance(value, list):
-				attributes[self.replaceKey(key)] = [copy.copy(item) for item in value]
-			else:
-				attributes[self.replaceKey(key)] = copy.copy(value)
-		return attributes
+from django.utils.simplejson import dumps
 
-	# If key has an underscore, replace with a dash.
-	# Python does not allow dash in object names.
-	def replaceKey(self, key):
-		if (key in self.replaceKeyDictionary):
-			return self.replaceKeyDictionary[key]
-		else:
-			return key
-
-	# Encode the chart attributes as JSON
-	def create(self):
-		attributes = copy.copy(self)
-		if NO_CJSON:
-			return json.dumps(attributes)
-		else:
-			return cjson.encode(attributes)
+class Chart(dict):
+    replaceKeyDictionary = {
+	    'on_show': 'on-show', 'on_click': 'on-click',
+	    'start_angle': 'start-angle', 'javascript_function': 'javascript-function',
+	    'threeD': '3d', 'tick_height': 'tick-height',
+	    'grid_colour': 'grid-colour', 'tick_length': 'tick-length',
+	    'spoke_labels': 'spoke-labels', 'barb_length': 'barb-length',
+	    'dot_style': 'dot-style', 'dot_size': 'dot-size',
+	    'halo_size': 'halo-size', 'line_style': 'line-style',
+	    'outline_colour': 'outline-colour', 'fill_alpha': 'fill-alpha',
+	    'gradient_fill': 'gradient-fill', 'negative_colour': 'negative-colour',}
+
+    def __getattribute__(self, key):
+	try:
+	    return dict.__getattribute__(self, key)
+        except AttributeError:
+	    self.__dict__[key] = Chart()
+	    return dict.__getattribute__(self, key)
+
+    def __copy__(self):
+	attributes = dict()
+	for key, value in self.__dict__.items():
+	    if isinstance(value, list):
+	        attributes[self.replaceKey(key)] = [copy.copy(item) for item in value]
+	    else:
+	        attributes[self.replaceKey(key)] = copy.copy(value)
+	return attributes
+
+    def replaceKey(self, key):
+        if (key in self.replaceKeyDictionary):
+	    return self.replaceKeyDictionary[key]
+        else:
+	    return key
+    
+    def render(self):
+        attributes = copy.copy(self)
+	return dumps(attributes)