changed models, fixing broken stuff
Merged to head
Merge https://github.com/HamidM250/S-Ware