diffs ! putting them together and shimming