added model generator
fixed merge conflict