More edits to new model.