changed model
rewrote some parts
Merge remote-tracking branch 'origin/master'