merged adams branch into mine