more changes to models
some changes to models