EmirH: changing imports