[EGAMI] some changes and updtes