modified models
fixed syntax
Merge pull request #24 from baraabourghli/essam-models_redefined

modified models