EmirH: made some small changes