Merged new changes