refactoring to django 1.5