syntax
improve syntax
Merge branch 'model'