Changed old code
- added javadoc
- removed old code
- redefined model