Code

Merge branch 'jk/diff-not-so-quick'