Change the way futures are returned