new changes for MGI fork