Removed return_all option