changes
django additions
prepared for ws