Logic changes in Model.