[EGAMI] some updates