merged the new changes