updated to have mapToFuture