models fixed
merge