made make_model more PG friendly