removed return_all function