Model{} changeover

Applying MODEL{} change to main branch