Changes to ze models
Merge branch 'WOUTAH'