small improvement in model_set_manager