EmirH: adding message
EmirH: merging