fix model

undoing something i was experimenting with
Merge pull request #1 from katerman/dev

fix model