not your problem, but wonder if we should put these on single lines so diffs are easier to read