fix

newModel fix
Fixes & Refactoring

Fixes & Refactoring