redo modify models
Merge branch 'master' into gkahn