Made model
Updates
Final changes