Importing changes from branch mine, exercise model_type