manually merging josh's awesome changes