client and adi added