model changes, needs additional work
merge fixes