Merge josh's changes.