merged new changes