merge josh's work