changed some models