some changes on model