Fixed models
merge with master