rearrange for django 1.4