Preparation for Modeling
Model ready
Merge branch 'model'