IDEX-1125: made changes after discussing on meeting