fit repo
Merge branch 'newmodel' into dev