revised how device handling is done for syncing