Changes to get_all_devices...