more changes in model and division