merging josh's shit