added additional Future logic