Updates
Fix merge conflicts, updated models
fix conflicts