merge in new changes