merging josh branch