updated models and template tags