updated for Adnand