updated models kinda..